Commit 994917f8 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 35200d86

drivers/char/pcmcia/ipwireless/main.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void signalled_reboot_work(struct work_struct *work_reboot) 
	struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,

			work_reboot);

	struct pcmcia_device *link = ipw->link;

	int ret = pccard_reset_card(link->socket);

	int ret = pcmcia_reset_card(link->socket);



	if (ret != 0)

		cs_error(link, ResetCard, ret);

drivers/net/pcmcia/nmclan_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static void mace_tx_timeout(struct net_device *dev) 
  printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);

#if RESET_ON_TIMEOUT

  printk("resetting card\n");

  pcmcia_reset_card(link, NULL);

  pcmcia_reset_card(link->socket);

#else /* #if RESET_ON_TIMEOUT */

  printk("NOT resetting card\n");

#endif /* #if RESET_ON_TIMEOUT */

drivers/net/wireless/orinoco_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv) 
	/* We need atomic ops here, because we're not holding the lock */

	set_bit(0, &card->hard_reset_in_progress);



	err = pcmcia_reset_card(link, NULL);

	err = pcmcia_reset_card(link->socket);

	if (err)

		return err;

drivers/pcmcia/cs.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/pcmcia/cs_internal.h

+11 −1
Original line number Diff line number Diff line
@@ -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);