diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:50:33 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:50:33 -0400 |
commit | 2f3061eb1086f98990d6495b8c63a1b83f2f59aa (patch) | |
tree | 01066412a16e05f459d405c2130ae98f95090d5f /drivers/char/pcmcia | |
parent | 994917f8b718f1cd7114317cc3cbf04fe46c1841 (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/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 6 | ||||
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index dcf2b59ca8c5..5216fce0c62d 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
@@ -127,7 +127,7 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
127 | goto exit0; | 127 | goto exit0; |
128 | } | 128 | } |
129 | 129 | ||
130 | ret = pcmcia_parse_tuple(link, &tuple, &parse); | 130 | ret = pcmcia_parse_tuple(&tuple, &parse); |
131 | 131 | ||
132 | if (ret != 0) { | 132 | if (ret != 0) { |
133 | cs_error(link, ParseTuple, ret); | 133 | cs_error(link, ParseTuple, ret); |
@@ -163,7 +163,7 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
163 | goto exit0; | 163 | goto exit0; |
164 | } | 164 | } |
165 | 165 | ||
166 | ret = pcmcia_parse_tuple(link, &tuple, &parse); | 166 | ret = pcmcia_parse_tuple(&tuple, &parse); |
167 | 167 | ||
168 | if (ret != 0) { | 168 | if (ret != 0) { |
169 | cs_error(link, GetTupleData, ret); | 169 | cs_error(link, GetTupleData, ret); |
@@ -206,7 +206,7 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
206 | goto exit1; | 206 | goto exit1; |
207 | } | 207 | } |
208 | 208 | ||
209 | ret = pcmcia_parse_tuple(link, &tuple, &parse); | 209 | ret = pcmcia_parse_tuple(&tuple, &parse); |
210 | 210 | ||
211 | if (ret != 0) { | 211 | if (ret != 0) { |
212 | cs_error(link, ParseTuple, ret); | 212 | cs_error(link, ParseTuple, ret); |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index d1fceabe3aef..05bf9c55ecc2 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -604,7 +604,7 @@ static int mgslpc_config(struct pcmcia_device *link) | |||
604 | 604 | ||
605 | cfg = &(parse.cftable_entry); | 605 | cfg = &(parse.cftable_entry); |
606 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); | 606 | CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple)); |
607 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse)); | 607 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse)); |
608 | 608 | ||
609 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg; | 609 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg; |
610 | if (cfg->index == 0) | 610 | if (cfg->index == 0) |