A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

pcmcia: remove unused argument to pcmcia_parse_tuple()

Browse source 
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 <[email protected]>
This commit is contained in:
Dominik Brodowski 2008-08-31 15:50:33 +02:00
commit 2f3061eb10
15 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/pcmcia/cistpl.c
View file

@ -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;

2
drivers/pcmcia/cs_internal.h
View file

@ -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);

2
drivers/pcmcia/pcmcia_ioctl.c
View file

@ -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);

2
drivers/pcmcia/pcmcia_resource.c
View file

@ -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 */