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>
This commit is contained in:
Родитель
994917f8b7
Коммит
2f3061eb10
|
@ -127,7 +127,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
|
|||
goto exit0;
|
||||
}
|
||||
|
||||
ret = pcmcia_parse_tuple(link, &tuple, &parse);
|
||||
ret = pcmcia_parse_tuple(&tuple, &parse);
|
||||
|
||||
if (ret != 0) {
|
||||
cs_error(link, ParseTuple, ret);
|
||||
|
@ -163,7 +163,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
|
|||
goto exit0;
|
||||
}
|
||||
|
||||
ret = pcmcia_parse_tuple(link, &tuple, &parse);
|
||||
ret = pcmcia_parse_tuple(&tuple, &parse);
|
||||
|
||||
if (ret != 0) {
|
||||
cs_error(link, GetTupleData, ret);
|
||||
|
@ -206,7 +206,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
|
|||
goto exit1;
|
||||
}
|
||||
|
||||
ret = pcmcia_parse_tuple(link, &tuple, &parse);
|
||||
ret = pcmcia_parse_tuple(&tuple, &parse);
|
||||
|
||||
if (ret != 0) {
|
||||
cs_error(link, ParseTuple, ret);
|
||||
|
|
|
@ -604,7 +604,7 @@ static int mgslpc_config(struct pcmcia_device *link)
|
|||
|
||||
cfg = &(parse.cftable_entry);
|
||||
CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
|
||||
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
|
||||
CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
|
||||
|
||||
if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
|
||||
if (cfg->index == 0)
|
||||
|
|
|
@ -374,7 +374,7 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,
|
|||
cs_error(link, GetTupleData, rc);
|
||||
break;
|
||||
}
|
||||
rc = pcmcia_parse_tuple(link, &tuple, &parse);
|
||||
rc = pcmcia_parse_tuple(&tuple, &parse);
|
||||
if (rc != 0) {
|
||||
cs_error(link, ParseTuple, rc);
|
||||
break;
|
||||
|
@ -498,11 +498,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
|
|||
|
||||
DEBUG(3, "link=0x%p", link);
|
||||
|
||||
DEBUG(2, "Validating CIS");
|
||||
ret = pcmcia_validate_cis(link, NULL);
|
||||
if (ret != 0)
|
||||
cs_error(link, GetTupleData, ret);
|
||||
|
||||
card_settings(dev, link, &new_name);
|
||||
|
||||
dev->pcmcia_map.phys = NO_XIP;
|
||||
|
|
|
@ -362,7 +362,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
|
|||
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
|
||||
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
|
||||
CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
|
||||
CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
|
||||
CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
|
||||
link->conf.ConfigIndex = parse.cftable_entry.index;
|
||||
switch (link->manf_id) {
|
||||
case MANFID_TDK:
|
||||
|
|
|
@ -415,7 +415,7 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
|
|||
i = pcmcia_get_tuple_data(handle, tuple);
|
||||
if (i != 0)
|
||||
return i;
|
||||
return pcmcia_parse_tuple(handle, tuple, parse);
|
||||
return pcmcia_parse_tuple(tuple, parse);
|
||||
}
|
||||
|
||||
static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
|
||||
|
@ -426,7 +426,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
|
|||
if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||
|
||||
(i = pcmcia_get_tuple_data(handle, tuple)) != 0)
|
||||
return i;
|
||||
return pcmcia_parse_tuple(handle, tuple, parse);
|
||||
return pcmcia_parse_tuple(tuple, parse);
|
||||
}
|
||||
|
||||
/*======================================================================
|
||||
|
|
|
@ -377,7 +377,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
|
|||
|
||||
if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &&
|
||||
(err = pcmcia_get_tuple_data(handle, tuple)) == 0)
|
||||
err = pcmcia_parse_tuple(handle, tuple, parse);
|
||||
err = pcmcia_parse_tuple(tuple, parse);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -388,7 +388,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
|
|||
|
||||
if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &&
|
||||
(err = pcmcia_get_tuple_data(handle, tuple)) == 0)
|
||||
err = pcmcia_parse_tuple(handle, tuple, parse);
|
||||
err = pcmcia_parse_tuple(tuple, parse);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
|
|||
res = pcmcia_get_tuple_data(dev, &tuple);
|
||||
if (res != 0)
|
||||
goto err_kfree_ssb;
|
||||
res = pcmcia_parse_tuple(dev, &tuple, &parse);
|
||||
res = pcmcia_parse_tuple(&tuple, &parse);
|
||||
if (res != 0)
|
||||
goto err_kfree_ssb;
|
||||
|
||||
|
|
|
@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
|
|||
tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
|
||||
if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
|
||||
pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
|
||||
pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
|
||||
pcmcia_parse_tuple(&tuple, parse) ||
|
||||
parse->longlink_mfc.nfn < 2) {
|
||||
/* No multi-function links found */
|
||||
ret = -ENODEV;
|
||||
|
|
|
@ -798,7 +798,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
|
|||
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
|
||||
if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
|
||||
(ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
|
||||
(ret = pcmcia_parse_tuple(p_dev, &tuple, &parse)) != 0)
|
||||
(ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
|
||||
{
|
||||
lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
|
||||
goto out1;
|
||||
|
|
|
@ -1359,7 +1359,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
|
|||
|
||||
/*====================================================================*/
|
||||
|
||||
int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
|
||||
int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
|
@ -1442,7 +1442,7 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
|
|||
__cs_dbg(0, "parse_tuple failed %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(pccard_parse_tuple);
|
||||
EXPORT_SYMBOL(pcmcia_parse_tuple);
|
||||
|
||||
/*======================================================================
|
||||
|
||||
|
@ -1472,7 +1472,7 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t
|
|||
ret = pccard_get_tuple_data(s, &tuple);
|
||||
if (ret != 0)
|
||||
goto done;
|
||||
ret = pccard_parse_tuple(&tuple, parse);
|
||||
ret = pcmcia_parse_tuple(&tuple, parse);
|
||||
done:
|
||||
kfree(buf);
|
||||
return ret;
|
||||
|
|
|
@ -197,6 +197,8 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function,
|
|||
cisdata_t code, void *parse);
|
||||
int pcmcia_replace_cis(struct pcmcia_socket *s,
|
||||
const u8 *data, const size_t len);
|
||||
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function,
|
||||
unsigned int *count);
|
||||
|
||||
/* rsrc_mgr.c */
|
||||
int pcmcia_validate_mem(struct pcmcia_socket *s);
|
||||
|
|
|
@ -858,7 +858,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
|
|||
break;
|
||||
case DS_PARSE_TUPLE:
|
||||
buf->tuple.TupleData = buf->tuple_parse.data;
|
||||
ret = pccard_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
|
||||
ret = pcmcia_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
|
||||
break;
|
||||
case DS_RESET_CARD:
|
||||
ret = pcmcia_reset_card(s);
|
||||
|
|
|
@ -937,7 +937,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
|
|||
if (pcmcia_get_tuple_data(p_dev, tuple))
|
||||
goto next_entry;
|
||||
|
||||
if (pcmcia_parse_tuple(p_dev, tuple, &cfg_mem->parse))
|
||||
if (pcmcia_parse_tuple(tuple, &cfg_mem->parse))
|
||||
goto next_entry;
|
||||
|
||||
/* default values */
|
||||
|
|
|
@ -436,7 +436,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
|
|||
i = pcmcia_get_tuple_data(handle, tuple);
|
||||
if (i != 0)
|
||||
return i;
|
||||
return pcmcia_parse_tuple(handle, tuple, parse);
|
||||
return pcmcia_parse_tuple(tuple, parse);
|
||||
}
|
||||
|
||||
/*====================================================================*/
|
||||
|
|
|
@ -583,13 +583,12 @@ typedef struct cisinfo_t {
|
|||
#ifdef __KERNEL__
|
||||
struct pcmcia_socket;
|
||||
|
||||
int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
|
||||
|
||||
/* don't use outside of PCMCIA core yet */
|
||||
int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
|
||||
int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple);
|
||||
int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
|
||||
int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse);
|
||||
|
||||
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *count);
|
||||
|
||||
/* ... but use these wrappers instead */
|
||||
#define pcmcia_get_first_tuple(p_dev, tuple) \
|
||||
|
@ -601,12 +600,6 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
|
|||
#define pcmcia_get_tuple_data(p_dev, tuple) \
|
||||
pccard_get_tuple_data(p_dev->socket, tuple)
|
||||
|
||||
#define pcmcia_parse_tuple(p_dev, tuple, parse) \
|
||||
pccard_parse_tuple(tuple, parse)
|
||||
|
||||
#define pcmcia_validate_cis(p_dev, info) \
|
||||
pccard_validate_cis(p_dev->socket, p_dev->func, info)
|
||||
|
||||
int pcmcia_loop_config(struct pcmcia_device *p_dev,
|
||||
int (*conf_check) (struct pcmcia_device *p_dev,
|
||||
cistpl_cftable_entry_t *cf,
|
||||
|
|
Загрузка…
Ссылка в новой задаче