mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
pcmcia: card services header cleanup
16-bit PCMCIA device handling function definitions are moved to ds.h, internal definitions to cs_internal.h. Signed-off-by: Dominik Brodowski <[email protected]>
This commit is contained in:
parent
35200d865d
commit
994917f8b7
9 changed files with 76 additions and 77 deletions
|
|
@ -752,7 +752,7 @@ EXPORT_SYMBOL(pccard_register_pcmcia);
|
|||
* CIS register.
|
||||
*/
|
||||
|
||||
int pccard_reset_card(struct pcmcia_socket *skt)
|
||||
int pcmcia_reset_card(struct pcmcia_socket *skt)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
|
@ -791,7 +791,7 @@ int pccard_reset_card(struct pcmcia_socket *skt)
|
|||
|
||||
return ret;
|
||||
} /* reset_card */
|
||||
EXPORT_SYMBOL(pccard_reset_card);
|
||||
EXPORT_SYMBOL(pcmcia_reset_card);
|
||||
|
||||
|
||||
/* These shut down or wake up a socket. They are sort of user
|
||||
|
|
|
|||
|
|
@ -174,10 +174,18 @@ int pcmcia_get_window(struct pcmcia_socket *s,
|
|||
window_handle_t *handle,
|
||||
int idx,
|
||||
win_req_t *req);
|
||||
int pccard_reset_card(struct pcmcia_socket *skt);
|
||||
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
|
||||
struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);
|
||||
|
||||
int pcmcia_suspend_card(struct pcmcia_socket *skt);
|
||||
int pcmcia_resume_card(struct pcmcia_socket *skt);
|
||||
|
||||
int pcmcia_eject_card(struct pcmcia_socket *skt);
|
||||
int pcmcia_insert_card(struct pcmcia_socket *skt);
|
||||
|
||||
struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);
|
||||
void pcmcia_put_socket(struct pcmcia_socket *skt);
|
||||
|
||||
/* cistpl.c */
|
||||
int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,
|
||||
u_int addr, u_int len, void *ptr);
|
||||
|
|
@ -187,6 +195,8 @@ void release_cis_mem(struct pcmcia_socket *s);
|
|||
void destroy_cis_cache(struct pcmcia_socket *s);
|
||||
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);
|
||||
|
||||
/* rsrc_mgr.c */
|
||||
int pcmcia_validate_mem(struct pcmcia_socket *s);
|
||||
|
|
|
|||
|
|
@ -861,7 +861,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
|
|||
ret = pccard_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
|
||||
break;
|
||||
case DS_RESET_CARD:
|
||||
ret = pccard_reset_card(s);
|
||||
ret = pcmcia_reset_card(s);
|
||||
break;
|
||||
case DS_GET_STATUS:
|
||||
if (buf->status.Function &&
|
||||
|
|
|
|||
Loading…
Reference in a new issue