Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] ppc32: 8xx: fec: fix interrupt handler prototypes
8xx: fec: fix interrupt handler prototypes
Signed-off-by: Aristeu Sergio Rozanski Filho <aris@conectiva.com.br>
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Aristeu Sergio Rozanski Filho
and committed by
Linus Torvalds
fbccb3d7
fc007ddd
+10
-5
+10
-5
arch/ppc/8xx_io/fec.c
+10
-5
arch/ppc/8xx_io/fec.c
···
199
199
#ifdef CONFIG_USE_MDIO
200
200
static void fec_enet_mii(struct net_device *dev);
201
201
#endif /* CONFIG_USE_MDIO */
202
-
static void fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs);
202
+
static irqreturn_t fec_enet_interrupt(int irq, void * dev_id,
203
+
struct pt_regs * regs);
203
204
#ifdef CONFIG_FEC_PACKETHOOK
204
205
static void fec_enet_tx(struct net_device *dev, __u32 regval);
205
206
static void fec_enet_rx(struct net_device *dev, __u32 regval);
···
472
471
/* The interrupt handler.
473
472
* This is called from the MPC core interrupt.
474
473
*/
475
-
static void
474
+
static irqreturn_t
476
475
fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)
477
476
{
478
477
struct net_device *dev = dev_id;
···
526
525
}
527
526
528
527
}
528
+
return IRQ_RETVAL(IRQ_HANDLED);
529
529
}
530
530
531
531
···
1405
1403
1406
1404
/* This interrupt occurs when the PHY detects a link change.
1407
1405
*/
1408
-
static void
1406
+
static
1409
1407
#ifdef CONFIG_RPXCLASSIC
1410
-
mii_link_interrupt(void *dev_id)
1408
+
void mii_link_interrupt(void *dev_id)
1411
1409
#else
1412
-
mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)
1410
+
irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)
1413
1411
#endif
1414
1412
{
1415
1413
#ifdef CONFIG_USE_MDIO
···
1442
1440
printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
1443
1441
#endif /* CONFIG_USE_MDIO */
1444
1442
1443
+
#ifndef CONFIG_RPXCLASSIC
1444
+
return IRQ_RETVAL(IRQ_HANDLED);
1445
+
#endif /* CONFIG_RPXCLASSIC */
1445
1446
}
1446
1447
1447
1448
static int