1 files changed, 24 insertions, 25 deletions

diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index a0c770ee4b64..4bd13922875d 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -182,8 +182,8 @@ void tulip_select_media(struct net_device *dev, int startup)
                 switch (mleaf->type) {
                 case 0:                                 /* 21140 non-MII xcvr. */
                         if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: Using a 21140 non-MII transceiver with control setting %02x\n",
-                                       dev->name, p[1]);
+                                netdev_dbg(dev, "Using a 21140 non-MII transceiver with control setting %02x\n",
+                                           p[1]);
                         dev->if_port = p[0];
                         if (startup)
                                 iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
@@ -204,15 +204,14 @@ void tulip_select_media(struct net_device *dev, int startup)
                                 struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
                                 unsigned char *rst = rleaf->leafdata;
                                 if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s: Resetting the transceiver\n",
-                                               dev->name);
+                                        netdev_dbg(dev, "Resetting the transceiver\n");
                                 for (i = 0; i < rst[0]; i++)
                                         iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
                         }
                         if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: 21143 non-MII %s transceiver control %04x/%04x\n",
-                                       dev->name, medianame[dev->if_port],
-                                       setup[0], setup[1]);
+                                netdev_dbg(dev, "21143 non-MII %s transceiver control %04x/%04x\n",
+                                           medianame[dev->if_port],
+                                           setup[0], setup[1]);
                         if (p[0] & 0x40) {      /* SIA (CSR13-15) setup values are provided. */
                                 csr13val = setup[0];
                                 csr14val = setup[1];
@@ -239,8 +238,8 @@ void tulip_select_media(struct net_device *dev, int startup)
                                 if (startup) iowrite32(csr13val, ioaddr + CSR13);
                         }
                         if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s:  Setting CSR15 to %08x/%08x\n",
-                                       dev->name, csr15dir, csr15val);
+                                netdev_dbg(dev, "Setting CSR15 to %08x/%08x\n",
+                                           csr15dir, csr15val);
                         if (mleaf->type == 4)
                                 new_csr6 = 0x82020000 | ((setup[2] & 0x71) << 18);
                         else
@@ -316,9 +315,9 @@ void tulip_select_media(struct net_device *dev, int startup)
                                 if (tp->mii_advertise == 0)
                                         tp->mii_advertise = tp->advertising[phy_num];
                                 if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s:  Advertising %04x on MII %d\n",
-                                               dev->name, tp->mii_advertise,
-                                               tp->phys[phy_num]);
+                                        netdev_dbg(dev, " Advertising %04x on MII %d\n",
+                                                   tp->mii_advertise,
+                                                   tp->phys[phy_num]);
                                 tulip_mdio_write(dev, tp->phys[phy_num], 4, tp->mii_advertise);
                         }
                         break;
@@ -335,8 +334,7 @@ void tulip_select_media(struct net_device *dev, int startup)
                                 struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
                                 unsigned char *rst = rleaf->leafdata;
                                 if (tulip_debug > 1)
-                                        printk(KERN_DEBUG "%s: Resetting the transceiver\n",
-                                               dev->name);
+                                        netdev_dbg(dev, "Resetting the transceiver\n");
                                 for (i = 0; i < rst[0]; i++)
                                         iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
                         }
@@ -344,20 +342,21 @@ void tulip_select_media(struct net_device *dev, int startup)
                         break;
                 }
                 default:
-                        printk(KERN_DEBUG "%s:  Invalid media table selection %d\n",
-                               dev->name, mleaf->type);
+                        netdev_dbg(dev, " Invalid media table selection %d\n",
+                                   mleaf->type);
                         new_csr6 = 0x020E0000;
                 }
                 if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: Using media type %s, CSR12 is %02x\n",
-                               dev->name, medianame[dev->if_port],
+                        netdev_dbg(dev, "Using media type %s, CSR12 is %02x\n",
+                                   medianame[dev->if_port],
                                    ioread32(ioaddr + CSR12) & 0xff);
         } else if (tp->chip_id == LC82C168) {
                 if (startup && ! tp->medialock)
                         dev->if_port = tp->mii_cnt ? 11 : 0;
                 if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: PNIC PHY status is %3.3x, media %s\n",
-                               dev->name, ioread32(ioaddr + 0xB8), medianame[dev->if_port]);
+                        netdev_dbg(dev, "PNIC PHY status is %3.3x, media %s\n",
+                                   ioread32(ioaddr + 0xB8),
+                                   medianame[dev->if_port]);
                 if (tp->mii_cnt) {
                         new_csr6 = 0x810C0000;
                         iowrite32(0x0001, ioaddr + CSR15);
@@ -388,9 +387,9 @@ void tulip_select_media(struct net_device *dev, int startup)
                 } else
                         new_csr6 = 0x03860000;
                 if (tulip_debug > 1)
-                        printk(KERN_DEBUG "%s: No media description table, assuming %s transceiver, CSR12 %02x\n",
-                               dev->name, medianame[dev->if_port],
-                               ioread32(ioaddr + CSR12));
+                        netdev_dbg(dev, "No media description table, assuming %s transceiver, CSR12 %02x\n",
+                                   medianame[dev->if_port],
+                                   ioread32(ioaddr + CSR12));
         }
 
         tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
@@ -504,8 +503,8 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx)
 
                 /* Fixup for DLink with miswired PHY. */
                 if (mii_advert != to_advert) {
-                        printk(KERN_DEBUG "tulip%d:  Advertising %04x on PHY %d, previously advertising %04x\n",
-                               board_idx, to_advert, phy, mii_advert);
+                        pr_debug("tulip%d:  Advertising %04x on PHY %d, previously advertising %04x\n",
+                                 board_idx, to_advert, phy, mii_advert);
                         tulip_mdio_write (dev, phy, 4, to_advert);
                 }