[PATCH 8/8] pcmcia: update M8XX driver to cope with core changes

Dominik Brodowski linux at dominikbrodowski.net
Sat Sep 24 15:58:48 EDT 2005


M8XX doesn't need to set get_socket any more.

Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

Index: 2.6.14-rc2-mm1/drivers/pcmcia/m8xx_pcmcia.c
===================================================================
--- 2.6.14-rc2-mm1.orig/drivers/pcmcia/m8xx_pcmcia.c
+++ 2.6.14-rc2-mm1/drivers/pcmcia/m8xx_pcmcia.c
@@ -841,17 +841,6 @@ static int m8xx_get_status(struct pcmcia
 	return 0;
 }
 
-static int m8xx_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
-{
-	int lsock = container_of(sock, struct socket_info, socket)->slot;
-	*state = socket[lsock].state; /* copy the whole structure */
-
-	dprintk("GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, "
-	      "io_irq %d, csc_mask %#2.2x\n", lsock, state->flags,
-	      state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
-	return 0;
-}
-
 static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
 {
 	int lsock = container_of(sock, struct socket_info, socket)->slot;
@@ -1187,7 +1176,6 @@ static struct pccard_operations m8xx_ser
 	.init	= m8xx_sock_init,
 	.suspend = m8xx_suspend,
 	.get_status = m8xx_get_status,
-	.get_socket = m8xx_get_socket,
 	.set_socket = m8xx_set_socket,
 	.set_io_map = m8xx_set_io_map,
 	.set_mem_map = m8xx_set_mem_map,



More information about the linux-pcmcia mailing list