5 files changed, 33 insertions, 23 deletions

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 466a89e24444..d7621239059a 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -271,8 +271,6 @@ static void catc_rx_done(struct urb *urb)
 
         } while (pkt_start - (u8 *) urb->transfer_buffer < urb->actual_length);
 
-        catc->netdev->last_rx = jiffies;
-
         if (catc->is_f5u011) {
                 if (atomic_read(&catc->recq_sz)) {
                         int status;
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index b5143509e8be..bbcc76ae3c9c 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -344,14 +344,14 @@ out:
 static int mcs7830_mdio_read(struct net_device *netdev, int phy_id,
                              int location)
 {
-        struct usbnet *dev = netdev->priv;
+        struct usbnet *dev = netdev_priv(netdev);
         return mcs7830_read_phy(dev, location);
 }
 
 static void mcs7830_mdio_write(struct net_device *netdev, int phy_id,
                                 int location, int val)
 {
-        struct usbnet *dev = netdev->priv;
+        struct usbnet *dev = netdev_priv(netdev);
         mcs7830_write_phy(dev, location, val);
 }
 
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7914867110ed..075e8e94225e 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1213,7 +1213,7 @@ static void pegasus_set_multicast(struct net_device *net)
                 pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
                 pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
                 if (netif_msg_link(pegasus))
-                        pr_info("%s: set allmulti\n", net->name);
+                        pr_debug("%s: set allmulti\n", net->name);
         } else {
                 pegasus->eth_regs[EthCtrl0] &= ~RX_MULTICAST;
                 pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
@@ -1273,6 +1273,7 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
 }
 
 
+static int pegasus_count;
 static struct workqueue_struct *pegasus_workqueue = NULL;
 #define CARRIER_CHECK_DELAY (2 * HZ)
 
@@ -1301,6 +1302,18 @@ static int pegasus_blacklisted(struct usb_device *udev)
         return 0;
 }
 
+/* we rely on probe() and remove() being serialized so we
+ * don't need extra locking on pegasus_count.
+ */
+static void pegasus_dec_workqueue(void)
+{
+        pegasus_count--;
+        if (pegasus_count == 0) {
+                destroy_workqueue(pegasus_workqueue);
+                pegasus_workqueue = NULL;
+        }
+}
+
 static int pegasus_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
@@ -1309,14 +1322,18 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus_t *pegasus;
         int dev_index = id - pegasus_ids;
         int res = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
-        usb_get_dev(dev);
+        if (pegasus_blacklisted(dev))
+                return -ENODEV;
 
-        if (pegasus_blacklisted(dev)) {
-                res = -ENODEV;
-                goto out;
+        if (pegasus_count == 0) {
+                pegasus_workqueue = create_singlethread_workqueue("pegasus");
+                if (!pegasus_workqueue)
+                        return -ENOMEM;
         }
+        pegasus_count++;
+
+        usb_get_dev(dev);
 
         net = alloc_etherdev(sizeof(struct pegasus));
         if (!net) {
@@ -1386,10 +1403,10 @@ static int pegasus_probe(struct usb_interface *intf,
         queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
                                 CARRIER_CHECK_DELAY);
 
-        dev_info(&intf->dev, "%s, %s, %s\n",
+        dev_info(&intf->dev, "%s, %s, %pM\n",
                  net->name,
                  usb_dev_id[dev_index].name,
-                 print_mac(mac, net->dev_addr));
+                 net->dev_addr);
         return 0;
 
 out3:
@@ -1401,6 +1418,7 @@ out1:
         free_netdev(net);
 out:
         usb_put_dev(dev);
+        pegasus_dec_workqueue();
         return res;
 }
 
@@ -1426,6 +1444,7 @@ static void pegasus_disconnect(struct usb_interface *intf)
                 pegasus->rx_skb = NULL;
         }
         free_netdev(pegasus->net);
+        pegasus_dec_workqueue();
 }
 
 static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
@@ -1469,7 +1488,7 @@ static struct usb_driver pegasus_driver = {
         .resume = pegasus_resume,
 };
 
-static void parse_id(char *id)
+static void __init parse_id(char *id)
 {
         unsigned int vendor_id=0, device_id=0, flags=0, i=0;
         char *token, *name=NULL;
@@ -1505,15 +1524,11 @@ static int __init pegasus_init(void)
         pr_info("%s: %s, " DRIVER_DESC "\n", driver_name, DRIVER_VERSION);
         if (devid)
                 parse_id(devid);
-        pegasus_workqueue = create_singlethread_workqueue("pegasus");
-        if (!pegasus_workqueue)
-                return -ENOMEM;
         return usb_register(&pegasus_driver);
 }
 
 static void __exit pegasus_exit(void)
 {
-        destroy_workqueue(pegasus_workqueue);
         usb_deregister(&pegasus_driver);
 }
 
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 51e2f5d7d14e..e0d349f74642 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -759,7 +759,6 @@ static int smsc95xx_reset(struct usbnet *dev)
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
         u32 read_buf, write_buf, burst_cap;
         int ret = 0, timeout;
-        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_ifup(dev))
                 devdbg(dev, "entering smsc95xx_reset");
@@ -818,8 +817,7 @@ static int smsc95xx_reset(struct usbnet *dev)
                 return ret;
 
         if (netif_msg_ifup(dev))
-                devdbg(dev, "MAC Address: %s",
-                        print_mac(mac, dev->net->dev_addr));
+                devdbg(dev, "MAC Address: %pM", dev->net->dev_addr);
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 02d25c743994..aa3149078888 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1125,7 +1125,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         struct usb_device               *xdev;
         int                             status;
         const char                      *name;
-        DECLARE_MAC_BUF(mac);
 
         name = udev->dev.driver->name;
         info = (struct driver_info *) prod->driver_info;
@@ -1236,11 +1235,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         if (status)
                 goto out3;
         if (netif_msg_probe (dev))
-                devinfo (dev, "register '%s' at usb-%s-%s, %s, %s",
+                devinfo (dev, "register '%s' at usb-%s-%s, %s, %pM",
                         udev->dev.driver->name,
                         xdev->bus->bus_name, xdev->devpath,
                         dev->driver_info->description,
-                        print_mac(mac, net->dev_addr));
+                        net->dev_addr);
 
         // ok, it's ready to go.
         usb_set_intfdata (udev, dev);