diff options
| author |   Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 11:55:19 -0400 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:38 -0400 |
| commit | 1ac812f161801c276dd520def0e81b9938eb7761 (patch) | |
| tree | 7faaf3a9631daed7fa0814ca162f3a2ffc424467 /drivers | |
| parent | [PATCH] libertas: change debug output of libertas_interrupt() (diff) | |
| download | linux-dev-1ac812f161801c276dd520def0e81b9938eb7761.tar.xz linux-dev-1ac812f161801c276dd520def0e81b9938eb7761.zip | |
[PATCH] libertas: get rid of libertas_sbi_get_priv()
It's not really needed, because we can call wlan_remove_card() with
wlan_private* anyway.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/libertas/decl.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 13 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/sbi.h | 1 |
4 files changed, 3 insertions, 16 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 9eed599f09a3..895f85331ce2 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h @@ -78,7 +78,7 @@ int reset_device(wlan_private *priv); extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no); wlan_private *wlan_add_card(void *card); -int wlan_remove_card(void *card); +int wlan_remove_card(wlan_private *priv); int wlan_add_mesh(wlan_private *priv); void wlan_remove_mesh(wlan_private *priv); diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index c1a662b065b0..bf7ef6582c59 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -231,7 +231,7 @@ static void if_usb_disconnect(struct usb_interface *intf) /* card is removed and we can call wlan_remove_card */ lbs_deb_usbd(&cardp->udev->dev, "call remove card\n"); wlan_remove_mesh(priv); - wlan_remove_card(cardp); + wlan_remove_card(priv); /* Unlink and free urb */ if_usb_free(cardp); @@ -854,17 +854,6 @@ done: return ret; } -/** - * @brief Given a usb_card_rec return its wlan_private - * @param card pointer to a usb_card_rec - * @return pointer to wlan_private - */ -wlan_private *libertas_sbi_get_priv(void *card) -{ - struct usb_card_rec *cardp = card; - return cardp->priv; -} - #ifdef CONFIG_PM static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) { diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index b0cc42b67efb..f9369e50da3c 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -963,9 +963,8 @@ static void wake_pending_cmdnodes(wlan_private *priv) } -int wlan_remove_card(void *card) +int wlan_remove_card(wlan_private *priv) { - wlan_private *priv = libertas_sbi_get_priv(card); wlan_adapter *adapter; struct net_device *dev; union iwreq_data wrqu; diff --git a/drivers/net/wireless/libertas/sbi.h b/drivers/net/wireless/libertas/sbi.h index c8fe5d05eb76..d999078c3d1a 100644 --- a/drivers/net/wireless/libertas/sbi.h +++ b/drivers/net/wireless/libertas/sbi.h @@ -26,6 +26,5 @@ int libertas_sbi_prog_firmware(wlan_private *); int libertas_sbi_read_event_cause(wlan_private *); int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb); -wlan_private *libertas_sbi_get_priv(void *card); #endif /* _SBI_H */ |