diff options
author | Bjørn Mork <bjorn@mork.no> | 2013-11-01 06:16:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-02 02:02:03 -0400 |
commit | 085e50e1fe1268e1bea2b1b5a3a2b1ce7f30c786 (patch) | |
tree | 9b0bb47b2b0239c3102ecff5da2662c579ab63b0 | |
parent | 4d619f625a6011618de9fccc4b282d314d792897 (diff) |
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>
-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) | |||
1141 | return !ctx->connected; | 1141 | return !ctx->connected; |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | static int | ||
1145 | cdc_ncm_probe(struct usb_interface *udev, const struct usb_device_id *prod) | ||
1146 | { | ||
1147 | return usbnet_probe(udev, prod); | ||
1148 | } | ||
1149 | |||
1150 | static void cdc_ncm_disconnect(struct usb_interface *intf) | ||
1151 | { | ||
1152 | struct usbnet *dev = usb_get_intfdata(intf); | ||
1153 | |||
1154 | if (dev == NULL) | ||
1155 | return; /* already disconnected */ | ||
1156 | |||
1157 | usbnet_disconnect(intf); | ||
1158 | } | ||
1159 | |||
1160 | static const struct driver_info cdc_ncm_info = { | 1144 | static const struct driver_info cdc_ncm_info = { |
1161 | .description = "CDC NCM", | 1145 | .description = "CDC NCM", |
1162 | .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET, | 1146 | .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET, |
@@ -1267,8 +1251,8 @@ MODULE_DEVICE_TABLE(usb, cdc_devs); | |||
1267 | static struct usb_driver cdc_ncm_driver = { | 1251 | static struct usb_driver cdc_ncm_driver = { |
1268 | .name = "cdc_ncm", | 1252 | .name = "cdc_ncm", |
1269 | .id_table = cdc_devs, | 1253 | .id_table = cdc_devs, |
1270 | .probe = cdc_ncm_probe, | 1254 | .probe = usbnet_probe, |
1271 | .disconnect = cdc_ncm_disconnect, | 1255 | .disconnect = usbnet_disconnect, |
1272 | .suspend = usbnet_suspend, | 1256 | .suspend = usbnet_suspend, |
1273 | .resume = usbnet_resume, | 1257 | .resume = usbnet_resume, |
1274 | .reset_resume = usbnet_resume, | 1258 | .reset_resume = usbnet_resume, |