diff options
author | tom.leiming@gmail.com <tom.leiming@gmail.com> | 2012-06-11 11:19:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-12 21:50:23 -0400 |
commit | 50e7d153910b0735aa517c3d1f3723a88f66eaba (patch) | |
tree | 6c90ef6aab55bea6e86f8baead458b5fab67ed92 /drivers/net/usb | |
parent | 5c2f05139ad9459979b3102846fa61347896d148 (diff) |
usbnet:cdc-phonet: remove usb_get/put_dev in .probe and .disconnect
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>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/cdc-phonet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index d848d4dd5754..187c144c5e5b 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c | |||
@@ -394,7 +394,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
394 | SET_NETDEV_DEV(dev, &intf->dev); | 394 | SET_NETDEV_DEV(dev, &intf->dev); |
395 | 395 | ||
396 | pnd->dev = dev; | 396 | pnd->dev = dev; |
397 | pnd->usb = usb_get_dev(usbdev); | 397 | pnd->usb = usbdev; |
398 | pnd->intf = intf; | 398 | pnd->intf = intf; |
399 | pnd->data_intf = data_intf; | 399 | pnd->data_intf = data_intf; |
400 | spin_lock_init(&pnd->tx_lock); | 400 | spin_lock_init(&pnd->tx_lock); |
@@ -440,7 +440,6 @@ out: | |||
440 | static void usbpn_disconnect(struct usb_interface *intf) | 440 | static void usbpn_disconnect(struct usb_interface *intf) |
441 | { | 441 | { |
442 | struct usbpn_dev *pnd = usb_get_intfdata(intf); | 442 | struct usbpn_dev *pnd = usb_get_intfdata(intf); |
443 | struct usb_device *usb = pnd->usb; | ||
444 | 443 | ||
445 | if (pnd->disconnected) | 444 | if (pnd->disconnected) |
446 | return; | 445 | return; |
@@ -449,7 +448,6 @@ static void usbpn_disconnect(struct usb_interface *intf) | |||
449 | usb_driver_release_interface(&usbpn_driver, | 448 | usb_driver_release_interface(&usbpn_driver, |
450 | (pnd->intf == intf) ? pnd->data_intf : pnd->intf); | 449 | (pnd->intf == intf) ? pnd->data_intf : pnd->intf); |
451 | unregister_netdev(pnd->dev); | 450 | unregister_netdev(pnd->dev); |
452 | usb_put_dev(usb); | ||
453 | } | 451 | } |
454 | 452 | ||
455 | static struct usb_driver usbpn_driver = { | 453 | static struct usb_driver usbpn_driver = { |