1 files changed, 28 insertions, 28 deletions

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index b5e47dfa5529..95563982d19f 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -143,6 +143,8 @@ typedef struct board_info {
         void (*outblk)(void __iomem *port, void *data, int length);
         void (*dumpblk)(void __iomem *port, int length);
 
+        struct device   *dev;        /* parent device */
+
         struct resource *addr_res;   /* resources found */
         struct resource *data_res;
         struct resource *addr_req;   /* resources requested */
@@ -185,7 +187,8 @@ static void program_eeprom(board_info_t * db);
 static void
 dm9000_reset(board_info_t * db)
 {
-        PRINTK1("dm9000x: resetting\n");
+        dev_dbg(db->dev, "resetting device\n");
+
         /* RESET device */
         writeb(DM9000_NCR, db->io_addr);
         udelay(200);
@@ -301,14 +304,10 @@ static void dm9000_set_io(struct board_info *db, int byte_width)
                 db->inblk   = dm9000_inblk_8bit;
                 break;
 
-        case 2:
-                db->dumpblk = dm9000_dumpblk_16bit;
-                db->outblk  = dm9000_outblk_16bit;
-                db->inblk   = dm9000_inblk_16bit;
-                break;
 
         case 3:
-                printk(KERN_ERR PFX ": 3 byte IO, falling back to 16bit\n");
+                dev_dbg(db->dev, ": 3 byte IO, falling back to 16bit\n");
+        case 2:
                 db->dumpblk = dm9000_dumpblk_16bit;
                 db->outblk  = dm9000_outblk_16bit;
                 db->inblk   = dm9000_inblk_16bit;
@@ -411,18 +410,20 @@ dm9000_probe(struct platform_device *pdev)
         /* Init network device */
         ndev = alloc_etherdev(sizeof (struct board_info));
         if (!ndev) {
-                printk("%s: could not allocate device.\n", CARDNAME);
+                dev_err(&pdev->dev, "could not allocate device.\n");
                 return -ENOMEM;
         }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
-        PRINTK2("dm9000_probe()");
+        dev_dbg(&pdev->dev, "dm9000_probe()");
 
         /* setup board info structure */
         db = (struct board_info *) ndev->priv;
         memset(db, 0, sizeof (*db));
 
+        db->dev = &pdev->dev;
+
         spin_lock_init(&db->lock);
 
         if (pdev->num_resources < 2) {
@@ -451,7 +452,7 @@ dm9000_probe(struct platform_device *pdev)
 
                 if (db->addr_res == NULL || db->data_res == NULL ||
                     db->irq_res == NULL) {
-                        printk(KERN_ERR PFX "insufficient resources\n");
+                        dev_err(db->dev, "insufficient resources\n");
                         ret = -ENOENT;
                         goto out;
                 }
@@ -461,7 +462,7 @@ dm9000_probe(struct platform_device *pdev)
                                                   pdev->name);
 
                 if (db->addr_req == NULL) {
-                        printk(KERN_ERR PFX "cannot claim address reg area\n");
+                        dev_err(db->dev, "cannot claim address reg area\n");
                         ret = -EIO;
                         goto out;
                 }
@@ -469,7 +470,7 @@ dm9000_probe(struct platform_device *pdev)
                 db->io_addr = ioremap(db->addr_res->start, i);
 
                 if (db->io_addr == NULL) {
-                        printk(KERN_ERR "failed to ioremap address reg\n");
+                        dev_err(db->dev, "failed to ioremap address reg\n");
                         ret = -EINVAL;
                         goto out;
                 }
@@ -479,7 +480,7 @@ dm9000_probe(struct platform_device *pdev)
                                                   pdev->name);
 
                 if (db->data_req == NULL) {
-                        printk(KERN_ERR PFX "cannot claim data reg area\n");
+                        dev_err(db->dev, "cannot claim data reg area\n");
                         ret = -EIO;
                         goto out;
                 }
@@ -487,7 +488,7 @@ dm9000_probe(struct platform_device *pdev)
                 db->io_data = ioremap(db->data_res->start, iosize);
 
                 if (db->io_data == NULL) {
-                        printk(KERN_ERR "failed to ioremap data reg\n");
+                        dev_err(db->dev,"failed to ioremap data reg\n");
                         ret = -EINVAL;
                         goto out;
                 }
@@ -541,11 +542,11 @@ dm9000_probe(struct platform_device *pdev)
 
                 if (id_val == DM9000_ID)
                         break;
-                printk("%s: read wrong id 0x%08x\n", CARDNAME, id_val);
+                dev_err(db->dev, "read wrong id 0x%08x\n", id_val);
         }
 
         if (id_val != DM9000_ID) {
-                printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
+                dev_err(db->dev, "wrong id: 0x%08x\n", id_val);
                 ret = -ENODEV;
                 goto out;
         }
@@ -593,8 +594,8 @@ dm9000_probe(struct platform_device *pdev)
         }
 
         if (!is_valid_ether_addr(ndev->dev_addr))
-                printk("%s: Invalid ethernet MAC address.  Please "
-                       "set using ifconfig\n", ndev->name);
+                dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
+                         "set using ifconfig\n", ndev->name);
 
         platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
@@ -608,7 +609,7 @@ dm9000_probe(struct platform_device *pdev)
         return 0;
 
 out:
-        printk("%s: not found (%d).\n", CARDNAME, ret);
+        dev_err(db->dev, "not found (%d).\n", ret);
 
         dm9000_release_board(pdev, db);
         free_netdev(ndev);
@@ -625,7 +626,7 @@ dm9000_open(struct net_device *dev)
 {
         board_info_t *db = (board_info_t *) dev->priv;
 
-        PRINTK2("entering dm9000_open\n");
+        dev_dbg(db->dev, "entering %s\n", __func__);
 
         if (request_irq(dev->irq, &dm9000_interrupt, DM9000_IRQ_FLAGS, dev->name, dev))
                 return -EAGAIN;
@@ -900,7 +901,7 @@ dm9000_rx(struct net_device *dev)
 
                 /* Status check: this byte must be 0 or 1 */
                 if (rxbyte > DM9000_PKT_RDY) {
-                        printk("status check failed: %d\n", rxbyte);
+                        dev_warn(db->dev, "status check fail: %d\n", rxbyte);
                         iow(db, DM9000_RCR, 0x00);      /* Stop Device */
                         iow(db, DM9000_ISR, IMR_PAR);   /* Stop INT request */
                         return;
@@ -920,25 +921,25 @@ dm9000_rx(struct net_device *dev)
                 /* Packet Status check */
                 if (RxLen < 0x40) {
                         GoodPacket = false;
-                        PRINTK1("Bad Packet received (runt)\n");
+                        dev_dbg(db->dev, "Bad Packet received (runt)\n");
                 }
 
                 if (RxLen > DM9000_PKT_MAX) {
-                        PRINTK1("RST: RX Len:%x\n", RxLen);
+                        dev_dbg(db->dev, "RST: RX Len:%x\n", RxLen);
                 }
 
                 if (rxhdr.RxStatus & 0xbf) {
                         GoodPacket = false;
                         if (rxhdr.RxStatus & 0x01) {
-                                PRINTK1("fifo error\n");
+                                dev_dbg(db->dev, "fifo error\n");
                                 dev->stats.rx_fifo_errors++;
                         }
                         if (rxhdr.RxStatus & 0x02) {
-                                PRINTK1("crc error\n");
+                                dev_dbg(db->dev, "crc error\n");
                                 dev->stats.rx_crc_errors++;
                         }
                         if (rxhdr.RxStatus & 0x80) {
-                                PRINTK1("length error\n");
+                                dev_dbg(db->dev, "length error\n");
                                 dev->stats.rx_length_errors++;
                         }
                 }
@@ -1187,8 +1188,7 @@ dm9000_drv_remove(struct platform_device *pdev)
         dm9000_release_board(pdev, (board_info_t *) ndev->priv);
         free_netdev(ndev);              /* free device structure */
 
-        PRINTK1("clean_module() exit\n");
-
+        dev_dbg(&pdev->dev, "released and freed device\n");
         return 0;
 }