Skip to content

Commit 2b50176

Browse files
committed
blackfin: Prepare irq handlers for irq argument removal
The irq argument of most interrupt flow handlers is unused or merily used instead of a local variable. The handlers which need the irq argument can retrieve the irq number from the irq descriptor. Search and update was done with coccinelle and the invaluable help of Julia Lawall. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Julia Lawall <[email protected]> Cc: Steven Miao <[email protected]> Cc: [email protected]
1 parent badae6b commit 2b50176

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

arch/blackfin/mach-bf537/ints-priority.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,11 @@ static struct irq_chip bf537_mac_rx_irqchip = {
182182
.irq_unmask = bf537_mac_rx_unmask_irq,
183183
};
184184

185-
static void bf537_demux_mac_rx_irq(unsigned int int_irq,
185+
static void bf537_demux_mac_rx_irq(unsigned int __int_irq,
186186
struct irq_desc *desc)
187187
{
188+
unsigned int int_irq = irq_desc_get_irq(desc);
189+
188190
if (bfin_read_DMA1_IRQ_STATUS() & (DMA_DONE | DMA_ERR))
189191
bfin_handle_irq(IRQ_MAC_RX);
190192
else

arch/blackfin/mach-common/ints-priority.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,9 +825,9 @@ static void bfin_demux_gpio_block(unsigned int irq)
825825
}
826826
}
827827

828-
void bfin_demux_gpio_irq(unsigned int inta_irq,
829-
struct irq_desc *desc)
828+
void bfin_demux_gpio_irq(unsigned int __inta_irq, struct irq_desc *desc)
830829
{
830+
unsigned int inta_irq = irq_desc_get_irq(desc);
831831
unsigned int irq;
832832

833833
switch (inta_irq) {

0 commit comments

Comments
 (0)