diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-11-01 11:16:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-02 07:02:03 +0100 |
| commit | 085e50e1fe1268e1bea2b1b5a3a2b1ce7f30c786 (patch) | |
| tree | 9b0bb47b2b0239c3102ecff5da2662c579ab63b0 /drivers/net/usb | |
| parent | net: cdc_ncm: no point in filling up the NTBs if we send ZLPs (diff) | |
| download | linux-085e50e1fe1268e1bea2b1b5a3a2b1ce7f30c786.tar.xz linux-085e50e1fe1268e1bea2b1b5a3a2b1ce7f30c786.zip | |
net: cdc_ncm: remove probe and disconnect wrappers
These functions were merely wrappers around the usbnet
variants. Remove them.
Cc: Alexey Orishko <alexey.orishko@gmail.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/cdc_ncm.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 42c86200f076..c90d843ec528 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1141,22 +1141,6 @@ static int cdc_ncm_check_connect(struct usbnet *dev) return !ctx->connected; } -static int -cdc_ncm_probe(struct usb_interface *udev, const struct usb_device_id *prod) -{ - return usbnet_probe(udev, prod); -} - -static void cdc_ncm_disconnect(struct usb_interface *intf) -{ - struct usbnet *dev = usb_get_intfdata(intf); - - if (dev == NULL) - return; /* already disconnected */ - - usbnet_disconnect(intf); -} - static const struct driver_info cdc_ncm_info = { .description = "CDC NCM", .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET, @@ -1267,8 +1251,8 @@ MODULE_DEVICE_TABLE(usb, cdc_devs); static struct usb_driver cdc_ncm_driver = { .name = "cdc_ncm", .id_table = cdc_devs, - .probe = cdc_ncm_probe, - .disconnect = cdc_ncm_disconnect, + .probe = usbnet_probe, + .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, .reset_resume = usbnet_resume, |