Revert "cdc_subset: deal with a device that needs reset for timeout"

This reverts commit 20fbe3ae990fd54fc7d1f889d61958bc8b38f254.

As reported by Stephen Rothwell, it causes compile failures in certain
configurations:

  drivers/net/usb/cdc_subset.c:360:15: error: 'dummy_prereset' undeclared here (not in a function)
    .pre_reset = dummy_prereset,
                 ^
  drivers/net/usb/cdc_subset.c:361:16: error: 'dummy_postreset' undeclared here (not in a function)
    .post_reset = dummy_postreset,
                  ^

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David Miller <davem@davemloft.net>
Cc: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 27 deletions

diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index 3ef411efd86e..91f0919fe278 100644
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -85,34 +85,9 @@ static int always_connected (struct usbnet *dev)
  *
  *-------------------------------------------------------------------------*/
 
-static void m5632_recover(struct usbnet *dev)
-{
-        struct usb_device       *udev = dev->udev;
-        struct usb_interface    *intf = dev->intf;
-        int r;
-
-        r = usb_lock_device_for_reset(udev, intf);
-        if (r < 0)
-                return;
-
-        usb_reset_device(udev);
-        usb_unlock_device(udev);
-}
-
-static int dummy_prereset(struct usb_interface *intf)
-{
-        return 0;
-}
-
-static int dummy_postreset(struct usb_interface *intf)
-{
-        return 0;
-}
-
 static const struct driver_info ali_m5632_info = {
         .description =  "ALi M5632",
         .flags       = FLAG_POINTTOPOINT,
-        .recover     = m5632_recover,
 };
 
 #endif
@@ -357,8 +332,6 @@ static struct usb_driver cdc_subset_driver = {
         .probe =        usbnet_probe,
         .suspend =      usbnet_suspend,
         .resume =       usbnet_resume,
-        .pre_reset =    dummy_prereset,
-        .post_reset =   dummy_postreset,
         .disconnect =   usbnet_disconnect,
         .id_table =     products,
         .disable_hub_initiated_lpm = 1,