diff options
Diffstat (limited to 'arch/ppc/8xx_io/fec.c')
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 11b0aa6ca97e..2c604d4f6e8b 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -199,7 +199,6 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | |||
199 | #ifdef CONFIG_USE_MDIO | 199 | #ifdef CONFIG_USE_MDIO |
200 | static void fec_enet_mii(struct net_device *dev); | 200 | static void fec_enet_mii(struct net_device *dev); |
201 | #endif /* CONFIG_USE_MDIO */ | 201 | #endif /* CONFIG_USE_MDIO */ |
202 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); | ||
203 | #ifdef CONFIG_FEC_PACKETHOOK | 202 | #ifdef CONFIG_FEC_PACKETHOOK |
204 | static void fec_enet_tx(struct net_device *dev, __u32 regval); | 203 | static void fec_enet_tx(struct net_device *dev, __u32 regval); |
205 | static void fec_enet_rx(struct net_device *dev, __u32 regval); | 204 | static void fec_enet_rx(struct net_device *dev, __u32 regval); |
@@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) | |||
472 | * This is called from the MPC core interrupt. | 471 | * This is called from the MPC core interrupt. |
473 | */ | 472 | */ |
474 | static irqreturn_t | 473 | static irqreturn_t |
475 | fec_enet_interrupt(int irq, void * dev_id) | 474 | fec_enet_interrupt(int irq, void *dev_id) |
476 | { | 475 | { |
477 | struct net_device *dev = dev_id; | 476 | struct net_device *dev = dev_id; |
478 | volatile fec_t *fecp; | 477 | volatile fec_t *fecp; |
@@ -520,7 +519,7 @@ fec_enet_interrupt(int irq, void * dev_id) | |||
520 | #ifdef CONFIG_USE_MDIO | 519 | #ifdef CONFIG_USE_MDIO |
521 | fec_enet_mii(dev); | 520 | fec_enet_mii(dev); |
522 | #else | 521 | #else |
523 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__); | 522 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__); |
524 | #endif /* CONFIG_USE_MDIO */ | 523 | #endif /* CONFIG_USE_MDIO */ |
525 | } | 524 | } |
526 | 525 | ||
@@ -1441,7 +1440,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id) | |||
1441 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ | 1440 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ |
1442 | } | 1441 | } |
1443 | #else | 1442 | #else |
1444 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); | 1443 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__); |
1445 | #endif /* CONFIG_USE_MDIO */ | 1444 | #endif /* CONFIG_USE_MDIO */ |
1446 | 1445 | ||
1447 | #ifndef CONFIG_RPXCLASSIC | 1446 | #ifndef CONFIG_RPXCLASSIC |