diff options
Diffstat (limited to 'drivers/net/fs_enet/mac-fec.c')
-rw-r--r-- | drivers/net/fs_enet/mac-fec.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index ca806d1ab3f6..8a632f668c1f 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
@@ -257,8 +257,7 @@ static void restart(struct net_device *dev) | |||
257 | 257 | ||
258 | r = whack_reset(fep->fec.fecp); | 258 | r = whack_reset(fep->fec.fecp); |
259 | if (r != 0) | 259 | if (r != 0) |
260 | printk(KERN_ERR DRV_MODULE_NAME | 260 | dev_err(fep->dev, "FEC Reset FAILED!\n"); |
261 | ": %s FEC Reset FAILED!\n", dev->name); | ||
262 | /* | 261 | /* |
263 | * Set station address. | 262 | * Set station address. |
264 | */ | 263 | */ |
@@ -355,9 +354,7 @@ static void stop(struct net_device *dev) | |||
355 | udelay(1); | 354 | udelay(1); |
356 | 355 | ||
357 | if (i == FEC_RESET_DELAY) | 356 | if (i == FEC_RESET_DELAY) |
358 | printk(KERN_WARNING DRV_MODULE_NAME | 357 | dev_warn(fep->dev, "FEC timeout on graceful transmit stop\n"); |
359 | ": %s FEC timeout on graceful transmit stop\n", | ||
360 | dev->name); | ||
361 | /* | 358 | /* |
362 | * Disable FEC. Let only MII interrupts. | 359 | * Disable FEC. Let only MII interrupts. |
363 | */ | 360 | */ |
@@ -433,8 +430,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events) | |||
433 | 430 | ||
434 | static void ev_error(struct net_device *dev, u32 int_events) | 431 | static void ev_error(struct net_device *dev, u32 int_events) |
435 | { | 432 | { |
436 | printk(KERN_WARNING DRV_MODULE_NAME | 433 | struct fs_enet_private *fep = netdev_priv(dev); |
437 | ": %s FEC ERROR(s) 0x%x\n", dev->name, int_events); | 434 | |
435 | dev_warn(fep->dev, "FEC ERROR(s) 0x%x\n", int_events); | ||
438 | } | 436 | } |
439 | 437 | ||
440 | static int get_regs(struct net_device *dev, void *p, int *sizep) | 438 | static int get_regs(struct net_device *dev, void *p, int *sizep) |