aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 09:50:33 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 09:50:33 -0400
commit2f3061eb1086f98990d6495b8c63a1b83f2f59aa (patch)
tree01066412a16e05f459d405c2130ae98f95090d5f /drivers/net/wireless
parent994917f8b718f1cd7114317cc3cbf04fe46c1841 (diff)
pcmcia: remove unused argument to pcmcia_parse_tuple()
Since we're just parsing the tuple being passed to this function, we don't need any device-specific information. Also, remove the call to pcmcia_validate_cis() from pcmciamtd.c, since it is already called by the PCMCIA core. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/b43/pcmcia.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c2
-rw-r--r--drivers/net/wireless/libertas/if_cs.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index ab42fb6addf6..3cfc30307a27 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -87,7 +87,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
87 res = pcmcia_get_tuple_data(dev, &tuple); 87 res = pcmcia_get_tuple_data(dev, &tuple);
88 if (res != 0) 88 if (res != 0)
89 goto err_kfree_ssb; 89 goto err_kfree_ssb;
90 res = pcmcia_parse_tuple(dev, &tuple, &parse); 90 res = pcmcia_parse_tuple(&tuple, &parse);
91 if (res != 0) 91 if (res != 0)
92 goto err_kfree_ssb; 92 goto err_kfree_ssb;
93 93
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 2826e674a8e7..633740277352 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
305 tuple.DesiredTuple = CISTPL_LONGLINK_MFC; 305 tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
306 if (pcmcia_get_first_tuple(hw_priv->link, &tuple) || 306 if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
307 pcmcia_get_tuple_data(hw_priv->link, &tuple) || 307 pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
308 pcmcia_parse_tuple(hw_priv->link, &tuple, parse) || 308 pcmcia_parse_tuple(&tuple, parse) ||
309 parse->longlink_mfc.nfn < 2) { 309 parse->longlink_mfc.nfn < 2) {
310 /* No multi-function links found */ 310 /* No multi-function links found */
311 ret = -ENODEV; 311 ret = -ENODEV;
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 04d7a251e3f0..e2fe2d677324 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -798,7 +798,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
798 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; 798 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
799 if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 || 799 if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
800 (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 || 800 (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
801 (ret = pcmcia_parse_tuple(p_dev, &tuple, &parse)) != 0) 801 (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
802 { 802 {
803 lbs_pr_err("error in pcmcia_get_first_tuple etc\n"); 803 lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
804 goto out1; 804 goto out1;