drivers:staging:vt6656: remove usb_device_reset in main_usb.c:

Removed the usb_device_reset(), replace with call to usb_reset_device()
directly. Plus it removes the confusing function name and addressed
the checkpatch warning. This change also swaps string in the dev_warn() call
with __func__ argument to "vt6656_probe" instead of literal string
"usb_reset_device".

        WARNING: Prefer using "%s", __func__ to embedded function names
        #417: FILE: main_usb.c:417:
        +                        "usb_device_reset fail status=%d\n", status);

        total: 0 errors, 1 warnings, 1058 lines checked

And after fix:

         main_usb.c has no obvious style problems and is ready for submission.

Signed-off-by: Chewie Lin <linsh@oregonstate.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 9e074e9daf4e75e9421ede0d49249ce1ed5edbbb..028f54b453d0afc64cc8fb0dbfef5f117bf1fe35 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -407,16 +407,6 @@ static void vnt_free_rx_bufs(struct vnt_private *priv)
        }
 }
 
-static void usb_device_reset(struct vnt_private *priv)
-{
-       int status;
-
-       status = usb_reset_device(priv->usb);
-       if (status)
-               dev_warn(&priv->usb->dev,
-                        "usb_device_reset fail status=%d\n", status);
-}
-
 static void vnt_free_int_bufs(struct vnt_private *priv)
 {
        kfree(priv->int_buf.data_buf);
@@ -995,7 +985,10 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        SET_IEEE80211_DEV(priv->hw, &intf->dev);
 
-       usb_device_reset(priv);
+       rc = usb_reset_device(priv->usb);
+       if (rc)
+               dev_warn(&priv->usb->dev,
+                        "%s reset fail status=%d\n", __func__, rc);
 
        clear_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags);
        vnt_reset_command_timer(priv);