lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libertas: get rid of libertas_sbi_get_priv()

Browse Source 
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>
This commit is contained in:
Holger Schurig
2007-05-25 11:55:19 -04:00
committed by John W. Linville
parent ed37b51610
commit 1ac812f161
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ int reset_device(wlan_private *priv);
extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
int *cfp_no); int *cfp_no);
wlan_private *wlan_add_card(void *card); 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); int wlan_add_mesh(wlan_private *priv);
void wlan_remove_mesh(wlan_private *priv); void wlan_remove_mesh(wlan_private *priv);

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

@@ -231,7 +231,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
/* card is removed and we can call wlan_remove_card */ /* card is removed and we can call wlan_remove_card */
lbs_deb_usbd(&cardp->udev->dev, "call remove card\n"); lbs_deb_usbd(&cardp->udev->dev, "call remove card\n");
wlan_remove_mesh(priv); wlan_remove_mesh(priv);
wlan_remove_card(cardp); wlan_remove_card(priv);
/* Unlink and free urb */ /* Unlink and free urb */
if_usb_free(cardp); if_usb_free(cardp);
@@ -854,17 +854,6 @@ done:
return ret; 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 #ifdef CONFIG_PM
static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
{ {

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

@@ -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; wlan_adapter *adapter;
struct net_device *dev; struct net_device *dev;
union iwreq_data wrqu; union iwreq_data wrqu;

1
drivers/net/wireless/libertas/sbi.h
View File

@@ -26,6 +26,5 @@ int libertas_sbi_prog_firmware(wlan_private *);
int libertas_sbi_read_event_cause(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); 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 */ #endif /* _SBI_H */