diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-03-30 00:43:52 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-05-25 08:13:41 -0400 |
| commit | e9e334c35ec3cd262d13640b50b67a29870a7105 (patch) | |
| tree | bdbca850665100a44fad32317fcebdc68614abe7 | |
| parent | bc6b92f8c31788a2fdc65d9be903983e5da78921 (diff) | |
| download | linux-3.10-e9e334c35ec3cd262d13640b50b67a29870a7105.tar.gz linux-3.10-e9e334c35ec3cd262d13640b50b67a29870a7105.tar.bz2 linux-3.10-e9e334c35ec3cd262d13640b50b67a29870a7105.zip | |
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: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 43d9fb195c1..59e0efc98e2 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -63,22 +63,19 @@ unsigned long bfin_irq_flags = 0x1f; EXPORT_SYMBOL(bfin_irq_flags); #endif -/* The number of spurious interrupts */ -atomic_t num_spurious; - #ifdef CONFIG_PM unsigned long bfin_sic_iwr[3]; /* Up to 3 SIC_IWRx registers */ unsigned vr_wakeup; #endif -struct ivgx { +static struct ivgx { /* irq number for request_irq, available in mach-bf5xx/irq.h */ unsigned int irqno; /* corresponding bit in the SIC_ISR register */ unsigned int isrflag; } ivg_table[NR_PERI_INTS]; -struct ivg_slice { +static struct ivg_slice { /* position of first irq in ivg_table for given ivg */ struct ivgx *ifirst; struct ivgx *istop; @@ -1331,10 +1328,8 @@ void do_irq(int vec, struct pt_regs *fp) sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2(); # endif for (;; ivg++) { - if (ivg >= ivg_stop) { - atomic_inc(&num_spurious); + if (ivg >= ivg_stop) return; - } if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag) break; } @@ -1344,10 +1339,9 @@ void do_irq(int vec, struct pt_regs *fp) sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR(); for (;; ivg++) { - if (ivg >= ivg_stop) { - atomic_inc(&num_spurious); + if (ivg >= ivg_stop) return; - } else if (sic_status & ivg->isrflag) + if (sic_status & ivg->isrflag) break; } #endif @@ -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(); # endif for (;; ivg++) { - if (ivg >= ivg_stop) { - atomic_inc(&num_spurious); + if (ivg >= ivg_stop) return 0; - } if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag) break; } @@ -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(); for (;; ivg++) { - if (ivg >= ivg_stop) { - atomic_inc(&num_spurious); + if (ivg >= ivg_stop) return 0; - } else if (sic_status & ivg->isrflag) + if (sic_status & ivg->isrflag) break; } #endif |