diff options
Diffstat (limited to 'drivers/net/fs_enet/mac-scc.c')
-rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 5bfc99b9475e..c490a466cae1 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -367,9 +367,7 @@ static void stop(struct net_device *dev) | |||
367 | udelay(1); | 367 | udelay(1); |
368 | 368 | ||
369 | if (i == SCC_RESET_DELAY) | 369 | if (i == SCC_RESET_DELAY) |
370 | printk(KERN_WARNING DRV_MODULE_NAME | 370 | dev_warn(fep->dev, "SCC timeout on graceful transmit stop\n"); |
371 | ": %s SCC timeout on graceful transmit stop\n", | ||
372 | dev->name); | ||
373 | 371 | ||
374 | W16(sccp, scc_sccm, 0); | 372 | W16(sccp, scc_sccm, 0); |
375 | C32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | 373 | C32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); |
@@ -429,8 +427,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events) | |||
429 | 427 | ||
430 | static void ev_error(struct net_device *dev, u32 int_events) | 428 | static void ev_error(struct net_device *dev, u32 int_events) |
431 | { | 429 | { |
432 | printk(KERN_WARNING DRV_MODULE_NAME | 430 | struct fs_enet_private *fep = netdev_priv(dev); |
433 | ": %s SCC ERROR(s) 0x%x\n", dev->name, int_events); | 431 | |
432 | dev_warn(fep->dev, "SCC ERROR(s) 0x%x\n", int_events); | ||
434 | } | 433 | } |
435 | 434 | ||
436 | static int get_regs(struct net_device *dev, void *p, int *sizep) | 435 | static int get_regs(struct net_device *dev, void *p, int *sizep) |