Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 33 insertions, 31 deletions

diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index a2b30a10064f..5dfed9297b22 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -21,6 +21,7 @@
 #include <linux/usb.h>
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
+#include <linux/slab.h>
 
 /* datasheet:
  http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-930914.pdf
@@ -58,7 +59,7 @@ static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data)
         void *buf;
         int err = -ENOMEM;
 
-        devdbg(dev, "dm_read() reg=0x%02x length=%d", reg, length);
+        netdev_dbg(dev->net, "dm_read() reg=0x%02x length=%d\n", reg, length);
 
         buf = kmalloc(length, GFP_KERNEL);
         if (!buf)
@@ -89,7 +90,7 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)
         void *buf = NULL;
         int err = -ENOMEM;
 
-        devdbg(dev, "dm_write() reg=0x%02x, length=%d", reg, length);
+        netdev_dbg(dev->net, "dm_write() reg=0x%02x, length=%d\n", reg, length);
 
         if (data) {
                 buf = kmalloc(length, GFP_KERNEL);
@@ -112,7 +113,8 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)
 
 static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)
 {
-        devdbg(dev, "dm_write_reg() reg=0x%02x, value=0x%02x", reg, value);
+        netdev_dbg(dev->net, "dm_write_reg() reg=0x%02x, value=0x%02x\n",
+                   reg, value);
         return usb_control_msg(dev->udev,
                                usb_sndctrlpipe(dev->udev, 0),
                                DM_WRITE_REG,
@@ -142,13 +144,13 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value,
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                deverr(dev, "Error allocating URB in dm_write_async_helper!");
+                netdev_err(dev->net, "Error allocating URB in dm_write_async_helper!\n");
                 return;
         }
 
         req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
         if (!req) {
-                deverr(dev, "Failed to allocate memory for control request");
+                netdev_err(dev->net, "Failed to allocate memory for control request\n");
                 usb_free_urb(urb);
                 return;
         }
@@ -166,8 +168,8 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value,
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status < 0) {
-                deverr(dev, "Error submitting the control message: status=%d",
-                       status);
+                netdev_err(dev->net, "Error submitting the control message: status=%d\n",
+                           status);
                 kfree(req);
                 usb_free_urb(urb);
         }
@@ -175,15 +177,15 @@ static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value,
 
 static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
 {
-        devdbg(dev, "dm_write_async() reg=0x%02x length=%d", reg, length);
+        netdev_dbg(dev->net, "dm_write_async() reg=0x%02x length=%d\n", reg, length);
 
         dm_write_async_helper(dev, reg, 0, length, data);
 }
 
 static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
 {
-        devdbg(dev, "dm_write_reg_async() reg=0x%02x value=0x%02x",
-               reg, value);
+        netdev_dbg(dev->net, "dm_write_reg_async() reg=0x%02x value=0x%02x\n",
+                   reg, value);
 
         dm_write_async_helper(dev, reg, value, 0, NULL);
 }
@@ -211,7 +213,7 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *valu
         }
 
         if (i == DM_TIMEOUT) {
-                deverr(dev, "%s read timed out!", phy ? "phy" : "eeprom");
+                netdev_err(dev->net, "%s read timed out!\n", phy ? "phy" : "eeprom");
                 ret = -EIO;
                 goto out;
         }
@@ -219,8 +221,8 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *valu
         dm_write_reg(dev, DM_SHARED_CTRL, 0x0);
         ret = dm_read(dev, DM_SHARED_DATA, 2, value);
 
-        devdbg(dev, "read shared %d 0x%02x returned 0x%04x, %d",
-               phy, reg, *value, ret);
+        netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
+                   phy, reg, *value, ret);
 
  out:
         mutex_unlock(&dev->phy_mutex);
@@ -238,7 +240,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu
                 goto out;
 
         dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
-        dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1c : 0x14);
+        dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12);
 
         for (i = 0; i < DM_TIMEOUT; i++) {
                 u8 tmp;
@@ -254,7 +256,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu
         }
 
         if (i == DM_TIMEOUT) {
-                deverr(dev, "%s write timed out!", phy ? "phy" : "eeprom");
+                netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
                 ret = -EIO;
                 goto out;
         }
@@ -304,15 +306,15 @@ static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc)
         __le16 res;
 
         if (phy_id) {
-                devdbg(dev, "Only internal phy supported");
+                netdev_dbg(dev->net, "Only internal phy supported\n");
                 return 0;
         }
 
         dm_read_shared_word(dev, 1, loc, &res);
 
-        devdbg(dev,
-               "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x",
-               phy_id, loc, le16_to_cpu(res));
+        netdev_dbg(dev->net,
+                   "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
+                   phy_id, loc, le16_to_cpu(res));
 
         return le16_to_cpu(res);
 }
@@ -324,12 +326,12 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc,
         __le16 res = cpu_to_le16(val);
 
         if (phy_id) {
-                devdbg(dev, "Only internal phy supported");
+                netdev_dbg(dev->net, "Only internal phy supported\n");
                 return;
         }
 
-        devdbg(dev,"dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x",
-               phy_id, loc, val);
+        netdev_dbg(dev->net, "dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
+                   phy_id, loc, val);
 
         dm_write_shared_word(dev, 1, loc, res);
 }
@@ -381,13 +383,13 @@ static void dm9601_set_multicast(struct net_device *net)
 
         if (net->flags & IFF_PROMISC) {
                 rx_ctl |= 0x02;
-        } else if (net->flags & IFF_ALLMULTI || net->mc_count > DM_MAX_MCAST) {
+        } else if (net->flags & IFF_ALLMULTI ||
+                   netdev_mc_count(net) > DM_MAX_MCAST) {
                 rx_ctl |= 0x04;
-        } else if (net->mc_count) {
-                struct dev_mc_list *mc_list = net->mc_list;
-                int i;
+        } else if (!netdev_mc_empty(net)) {
+                struct dev_mc_list *mc_list;
 
-                for (i = 0; i < net->mc_count; i++, mc_list = mc_list->next) {
+                netdev_for_each_mc_addr(mc_list, net) {
                         u32 crc = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
                         hashes[crc >> 3] |= 1 << (crc & 0x7);
                 }
@@ -592,7 +594,7 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb)
                 }
                 else
                         netif_carrier_off(dev->net);
-                devdbg(dev, "Link Status is: %d", link);
+                netdev_dbg(dev->net, "Link Status is: %d\n", link);
         }
 }
 
@@ -603,15 +605,15 @@ static int dm9601_link_reset(struct usbnet *dev)
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
 
-        devdbg(dev, "link_reset() speed: %d duplex: %d",
-               ecmd.speed, ecmd.duplex);
+        netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",
+                   ecmd.speed, ecmd.duplex);
 
         return 0;
 }
 
 static const struct driver_info dm9601_info = {
         .description    = "Davicom DM9601 USB Ethernet",
-        .flags          = FLAG_ETHER,
+        .flags          = FLAG_ETHER | FLAG_LINK_INTR,
         .bind           = dm9601_bind,
         .rx_fixup       = dm9601_rx_fixup,
         .tx_fixup       = dm9601_tx_fixup,