tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

fs_enet: use dev_xxx instead of printk

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Anatolij Gustschin and committed by
David S. Miller fcb6a1c8 ce300c7f

+27 -38
+15 -24
drivers/net/fs_enet/fs_enet-main.c
··· 108 108 * the last indicator should be set. 109 109 */ 110 110 if ((sc & BD_ENET_RX_LAST) == 0) 111 - printk(KERN_WARNING DRV_MODULE_NAME 112 - ": %s rcv is not +last\n", 113 - dev->name); 111 + dev_warn(fep->dev, "rcv is not +last\n"); 114 112 115 113 /* 116 114 * Check for errors. ··· 176 178 received++; 177 179 netif_receive_skb(skb); 178 180 } else { 179 - printk(KERN_WARNING DRV_MODULE_NAME 180 - ": %s Memory squeeze, dropping packet.\n", 181 - dev->name); 181 + dev_warn(fep->dev, 182 + "Memory squeeze, dropping packet.\n"); 182 183 fep->stats.rx_dropped++; 183 184 skbn = skb; 184 185 } ··· 239 242 * the last indicator should be set. 240 243 */ 241 244 if ((sc & BD_ENET_RX_LAST) == 0) 242 - printk(KERN_WARNING DRV_MODULE_NAME 243 - ": %s rcv is not +last\n", 244 - dev->name); 245 + dev_warn(fep->dev, "rcv is not +last\n"); 245 246 246 247 /* 247 248 * Check for errors. ··· 308 313 received++; 309 314 netif_rx(skb); 310 315 } else { 311 - printk(KERN_WARNING DRV_MODULE_NAME 312 - ": %s Memory squeeze, dropping packet.\n", 313 - dev->name); 316 + dev_warn(fep->dev, 317 + "Memory squeeze, dropping packet.\n"); 314 318 fep->stats.rx_dropped++; 315 319 skbn = skb; 316 320 } ··· 382 388 } else 383 389 fep->stats.tx_packets++; 384 390 385 - if (sc & BD_ENET_TX_READY) 386 - printk(KERN_WARNING DRV_MODULE_NAME 387 - ": %s HEY! Enet xmit interrupt and TX_READY.\n", 388 - dev->name); 391 + if (sc & BD_ENET_TX_READY) { 392 + dev_warn(fep->dev, 393 + "HEY! Enet xmit interrupt and TX_READY.\n"); 394 + } 389 395 390 396 /* 391 397 * Deferred means some collisions occurred during transmit, ··· 505 511 for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) { 506 512 skb = dev_alloc_skb(ENET_RX_FRSIZE); 507 513 if (skb == NULL) { 508 - printk(KERN_WARNING DRV_MODULE_NAME 509 - ": %s Memory squeeze, unable to allocate skb\n", 510 - dev->name); 514 + dev_warn(fep->dev, 515 + "Memory squeeze, unable to allocate skb\n"); 511 516 break; 512 517 } 513 518 skb_align(skb, ENET_RX_ALIGN); ··· 603 610 * Ooops. All transmit buffers are full. Bail out. 604 611 * This should not happen, since the tx queue should be stopped. 605 612 */ 606 - printk(KERN_WARNING DRV_MODULE_NAME 607 - ": %s tx queue full!.\n", dev->name); 613 + dev_warn(fep->dev, "tx queue full!.\n"); 608 614 return NETDEV_TX_BUSY; 609 615 } 610 616 ··· 780 788 r = request_irq(fep->interrupt, fs_enet_interrupt, IRQF_SHARED, 781 789 "fs_enet-mac", dev); 782 790 if (r != 0) { 783 - printk(KERN_ERR DRV_MODULE_NAME 784 - ": %s Could not allocate FS_ENET IRQ!", dev->name); 791 + dev_err(fep->dev, "Could not allocate FS_ENET IRQ!"); 785 792 if (fep->fpi->use_napi) 786 793 napi_disable(&fep->napi); 787 794 return -EINVAL; ··· 1044 1053 if (ret) 1045 1054 goto out_free_bd; 1046 1055 1047 - printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr); 1056 + pr_info("%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr); 1048 1057 1049 1058 return 0; 1050 1059
+3 -2
drivers/net/fs_enet/mac-fcc.c
··· 476 476 477 477 static void ev_error(struct net_device *dev, u32 int_events) 478 478 { 479 - printk(KERN_WARNING DRV_MODULE_NAME 480 - ": %s FS_ENET ERROR(s) 0x%x\n", dev->name, int_events); 479 + struct fs_enet_private *fep = netdev_priv(dev); 480 + 481 + dev_warn(fep->dev, "FS_ENET ERROR(s) 0x%x\n", int_events); 481 482 } 482 483 483 484 static int get_regs(struct net_device *dev, void *p, int *sizep)
+5 -7
drivers/net/fs_enet/mac-fec.c
··· 257 257 258 258 r = whack_reset(fep->fec.fecp); 259 259 if (r != 0) 260 - printk(KERN_ERR DRV_MODULE_NAME 261 - ": %s FEC Reset FAILED!\n", dev->name); 260 + dev_err(fep->dev, "FEC Reset FAILED!\n"); 262 261 /* 263 262 * Set station address. 264 263 */ ··· 354 355 udelay(1); 355 356 356 357 if (i == FEC_RESET_DELAY) 357 - printk(KERN_WARNING DRV_MODULE_NAME 358 - ": %s FEC timeout on graceful transmit stop\n", 359 - dev->name); 358 + dev_warn(fep->dev, "FEC timeout on graceful transmit stop\n"); 360 359 /* 361 360 * Disable FEC. Let only MII interrupts. 362 361 */ ··· 430 433 431 434 static void ev_error(struct net_device *dev, u32 int_events) 432 435 { 433 - printk(KERN_WARNING DRV_MODULE_NAME 434 - ": %s FEC ERROR(s) 0x%x\n", dev->name, int_events); 436 + struct fs_enet_private *fep = netdev_priv(dev); 437 + 438 + dev_warn(fep->dev, "FEC ERROR(s) 0x%x\n", int_events); 435 439 } 436 440 437 441 static int get_regs(struct net_device *dev, void *p, int *sizep)
+4 -5
drivers/net/fs_enet/mac-scc.c
··· 367 367 udelay(1); 368 368 369 369 if (i == SCC_RESET_DELAY) 370 - printk(KERN_WARNING DRV_MODULE_NAME 371 - ": %s SCC timeout on graceful transmit stop\n", 372 - dev->name); 370 + dev_warn(fep->dev, "SCC timeout on graceful transmit stop\n"); 373 371 374 372 W16(sccp, scc_sccm, 0); 375 373 C32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); ··· 427 429 428 430 static void ev_error(struct net_device *dev, u32 int_events) 429 431 { 430 - printk(KERN_WARNING DRV_MODULE_NAME 431 - ": %s SCC ERROR(s) 0x%x\n", dev->name, int_events); 432 + struct fs_enet_private *fep = netdev_priv(dev); 433 + 434 + dev_warn(fep->dev, "SCC ERROR(s) 0x%x\n", int_events); 432 435 } 433 436 434 437 static int get_regs(struct net_device *dev, void *p, int *sizep)