Commit e9e334c3 authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: ints-priority: clean up some local vars

The local ivg structs need not be exported, so mark them as static.
Further, the "num_spurious" variable is only incremented and never
actually read anywhere, so punt it.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent bc6b92f8
...@@ -63,22 +63,19 @@ unsigned long bfin_irq_flags = 0x1f; ...@@ -63,22 +63,19 @@ unsigned long bfin_irq_flags = 0x1f;
EXPORT_SYMBOL(bfin_irq_flags); EXPORT_SYMBOL(bfin_irq_flags);
#endif #endif
/* The number of spurious interrupts */
atomic_t num_spurious;
#ifdef CONFIG_PM #ifdef CONFIG_PM
unsigned long bfin_sic_iwr[3]; /* Up to 3 SIC_IWRx registers */ unsigned long bfin_sic_iwr[3]; /* Up to 3 SIC_IWRx registers */
unsigned vr_wakeup; unsigned vr_wakeup;
#endif #endif
struct ivgx { static struct ivgx {
/* irq number for request_irq, available in mach-bf5xx/irq.h */ /* irq number for request_irq, available in mach-bf5xx/irq.h */
unsigned int irqno; unsigned int irqno;
/* corresponding bit in the SIC_ISR register */ /* corresponding bit in the SIC_ISR register */
unsigned int isrflag; unsigned int isrflag;
} ivg_table[NR_PERI_INTS]; } ivg_table[NR_PERI_INTS];
struct ivg_slice { static struct ivg_slice {
/* position of first irq in ivg_table for given ivg */ /* position of first irq in ivg_table for given ivg */
struct ivgx *ifirst; struct ivgx *ifirst;
struct ivgx *istop; struct ivgx *istop;
...@@ -1331,10 +1328,8 @@ void do_irq(int vec, struct pt_regs *fp) ...@@ -1331,10 +1328,8 @@ void do_irq(int vec, struct pt_regs *fp)
sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2(); sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();
# endif # endif
for (;; ivg++) { for (;; ivg++) {
if (ivg >= ivg_stop) { if (ivg >= ivg_stop)
atomic_inc(&num_spurious);
return; return;
}
if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag) if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
break; break;
} }
...@@ -1344,10 +1339,9 @@ void do_irq(int vec, struct pt_regs *fp) ...@@ -1344,10 +1339,9 @@ void do_irq(int vec, struct pt_regs *fp)
sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR(); sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
for (;; ivg++) { for (;; ivg++) {
if (ivg >= ivg_stop) { if (ivg >= ivg_stop)
atomic_inc(&num_spurious);
return; return;
} else if (sic_status & ivg->isrflag) if (sic_status & ivg->isrflag)
break; break;
} }
#endif #endif
...@@ -1403,10 +1397,8 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) ...@@ -1403,10 +1397,8 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2(); sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();
# endif # endif
for (;; ivg++) { for (;; ivg++) {
if (ivg >= ivg_stop) { if (ivg >= ivg_stop)
atomic_inc(&num_spurious);
return 0; return 0;
}
if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag) if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
break; break;
} }
...@@ -1416,10 +1408,9 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) ...@@ -1416,10 +1408,9 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR(); sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
for (;; ivg++) { for (;; ivg++) {
if (ivg >= ivg_stop) { if (ivg >= ivg_stop)
atomic_inc(&num_spurious);
return 0; return 0;
} else if (sic_status & ivg->isrflag) if (sic_status & ivg->isrflag)
break; break;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment