[PATCH] libertas: move generic firmware reset command to common code

It's not USB specific, so move it out of the USB interface code.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 25 insertions, 21 deletions

diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 40f56bb1eac8..846e79a77f67 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -86,6 +86,6 @@ int libertas_activate_card(wlan_private *priv, char *fw_name);
 int libertas_remove_card(wlan_private *priv);
 int libertas_add_mesh(wlan_private *priv, struct device *dev);
 void libertas_remove_mesh(wlan_private *priv);
-
+int libertas_reset_device(wlan_private *priv);
 
 #endif                          /* _WLAN_DECL_H_ */
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a3334f63a80d..e38fce73cf74 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -15,6 +15,7 @@
 #include "defs.h"
 #include "dev.h"
 #include "if_usb.h"
+#include "decl.h"
 
 #define MESSAGE_HEADER_LEN      4
 
@@ -44,7 +45,6 @@ MODULE_DEVICE_TABLE(usb, if_usb_table);
 
 static void if_usb_receive(struct urb *urb);
 static void if_usb_receive_fwload(struct urb *urb);
-static int if_usb_reset_device(wlan_private *priv);
 static int if_usb_register_dev(wlan_private * priv);
 static int if_usb_unregister_dev(wlan_private *);
 static int if_usb_prog_firmware(wlan_private *);
@@ -355,17 +355,20 @@ static int if_prog_firmware(wlan_private * priv)
         return 0;
 }
 
-static int libertas_do_reset(wlan_private *priv)
+static int if_usb_reset_device(wlan_private *priv)
 {
         int ret;
         struct usb_card_rec *cardp = priv->card;
 
         lbs_deb_enter(LBS_DEB_USB);
 
+        /* Try a USB port reset first, if that fails send the reset
+         * command to the firmware.
+         */
         ret = usb_reset_device(cardp->udev);
         if (!ret) {
                 msleep(10);
-                if_usb_reset_device(priv);
+                ret = libertas_reset_device(priv);
                 msleep(10);
         }
 
@@ -753,19 +756,6 @@ static int if_usb_read_event_cause(wlan_private * priv)
         return 0;
 }
 
-static int if_usb_reset_device(wlan_private *priv)
-{
-        int ret;
-
-        lbs_deb_enter(LBS_DEB_USB);
-        ret = libertas_prepare_and_send_command(priv, CMD_802_11_RESET,
-                                    CMD_ACT_HALT, 0, 0, NULL);
-        msleep_interruptible(10);
-
-        lbs_deb_leave_args(LBS_DEB_USB, "ret %d", ret);
-        return ret;
-}
-
 static int if_usb_unregister_dev(wlan_private * priv)
 {
         int ret = 0;
@@ -775,7 +765,7 @@ static int if_usb_unregister_dev(wlan_private * priv)
          * again.
          */
         if (priv)
-                if_usb_reset_device(priv);
+                libertas_reset_device(priv);
 
         return ret;
 }
@@ -862,7 +852,7 @@ restart:
 
         if (cardp->bootcmdresp == 0) {
                 if (--reset_count >= 0) {
-                        libertas_do_reset(priv);
+                        if_usb_reset_device(priv);
                         goto restart;
                 }
                 return -1;
@@ -892,7 +882,7 @@ restart:
         if (!cardp->fwdnldover) {
                 lbs_pr_info("failed to load fw, resetting device!\n");
                 if (--reset_count >= 0) {
-                        libertas_do_reset(priv);
+                        if_usb_reset_device(priv);
                         goto restart;
                 }
 
@@ -995,7 +985,7 @@ static void if_usb_exit_module(void)
         lbs_deb_enter(LBS_DEB_MAIN);
 
         list_for_each_entry_safe(cardp, cardp_temp, &usb_devices, list)
-                if_usb_reset_device((wlan_private *) cardp->priv);
+                libertas_reset_device((wlan_private *) cardp->priv);
 
         /* API unregisters the driver from USB subsystem */
         usb_deregister(&if_usb_driver);
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b9e4bf293224..589c583ddbeb 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1157,6 +1157,20 @@ void libertas_interrupt(struct net_device *dev)
 }
 EXPORT_SYMBOL_GPL(libertas_interrupt);
 
+int libertas_reset_device(wlan_private *priv)
+{
+        int ret;
+
+        lbs_deb_enter(LBS_DEB_MAIN);
+        ret = libertas_prepare_and_send_command(priv, CMD_802_11_RESET,
+                                    CMD_ACT_HALT, 0, 0, NULL);
+        msleep_interruptible(10);
+
+        lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(libertas_reset_device);
+
 static int libertas_init_module(void)
 {
         lbs_deb_enter(LBS_DEB_MAIN);