OSDN Git Service

usbnet:pegasus: remove usb_get/put_dev in .probe and .disconnect
authortom.leiming@gmail.com <tom.leiming@gmail.com>
Mon, 11 Jun 2012 15:19:40 +0000 (15:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jun 2012 01:50:23 +0000 (18:50 -0700)
usb_device is parent device of usb_interface in the view of driver
model, so its reference count is always held during .probe/.disconnect
of usb_interface instance.

This patch just removes the unnecessay usb_get/put_dev.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/pegasus.c

index 7023220..a0b5807 100644 (file)
@@ -1329,8 +1329,6 @@ static int pegasus_probe(struct usb_interface *intf,
        }
        pegasus_count++;
 
-       usb_get_dev(dev);
-
        net = alloc_etherdev(sizeof(struct pegasus));
        if (!net)
                goto out;
@@ -1407,7 +1405,6 @@ out2:
 out1:
        free_netdev(net);
 out:
-       usb_put_dev(dev);
        pegasus_dec_workqueue();
        return res;
 }
@@ -1425,7 +1422,6 @@ static void pegasus_disconnect(struct usb_interface *intf)
        pegasus->flags |= PEGASUS_UNPLUG;
        cancel_delayed_work(&pegasus->carrier_check);
        unregister_netdev(pegasus->net);
-       usb_put_dev(interface_to_usbdev(intf));
        unlink_all_urbs(pegasus);
        free_all_urbs(pegasus);
        free_skb_pool(pegasus);