Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dan Williams 2007-08-02 11:36:22 -04:00 committed by David S. Miller
parent ffcae953ac
commit eedc2a3191
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/libertas/decl.h
View File

@ -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_ */

30
drivers/net/wireless/libertas/if_usb.c
View File

@ -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);

14
drivers/net/wireless/libertas/main.c
View File

@ -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);