mv643xx_eth: report netdev name in all printks
authorLennert Buytenhek <buytenh@wantstofly.org>
Tue, 18 Mar 2008 18:37:19 +0000 (11:37 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 17 Apr 2008 00:06:49 +0000 (20:06 -0400)
In error and warning printks, always report the netdevice name
instead of the port index (the latter has no meaning when there
are multiple mv643xx_eth silicon blocks in the system.)

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
drivers/net/mv643xx_eth.c

index b31844cb1ab49f776e8dcef6a780b202947b6e58..5a4ae86e145fdbc34ea2c9e7f7ca1dc8baf12a3d 100644 (file)
@@ -1315,8 +1315,7 @@ static int mv643xx_eth_open(struct net_device *dev)
        err = request_irq(dev->irq, mv643xx_eth_int_handler,
                        IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
        if (err) {
-               printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
-                                                               port_num);
+               printk(KERN_ERR "%s: Can not assign IRQ\n", dev->name);
                return -EAGAIN;
        }
 
@@ -1916,9 +1915,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
        err = ethernet_phy_detect(mp);
        if (err) {
-               pr_debug("MV643xx ethernet port %d: "
-                                       "No PHY detected at addr %d\n",
-                                       port_num, ethernet_phy_get(mp));
+               pr_debug("%s: No PHY detected at addr %d\n",
+                               dev->name, ethernet_phy_get(mp));
                goto out;
        }
 
@@ -2909,8 +2907,7 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
        /* wait for the SMI register to become available */
        for (i = 0; mv_read(SMI_REG) & ETH_SMI_BUSY; i++) {
                if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY busy timeout, port %d\n",
-                               mp->port_num);
+                       printk("%s: PHY busy timeout\n", mp->dev->name);
                        goto out;
                }
                udelay(PHY_WAIT_MICRO_SECONDS);
@@ -2922,8 +2919,7 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
        /* now wait for the data to be valid */
        for (i = 0; !(mv_read(SMI_REG) & ETH_SMI_READ_VALID); i++) {
                if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY read timeout, port %d\n",
-                               mp->port_num);
+                       printk("%s: PHY read timeout\n", mp->dev->name);
                        goto out;
                }
                udelay(PHY_WAIT_MICRO_SECONDS);
@@ -2969,8 +2965,7 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp,
        /* wait for the SMI register to become available */
        for (i = 0; mv_read(SMI_REG) & ETH_SMI_BUSY; i++) {
                if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY busy timeout, port %d\n",
-                               mp->port_num);
+                       printk("%s: PHY busy timeout\n", mp->dev->name);
                        goto out;
                }
                udelay(PHY_WAIT_MICRO_SECONDS);