diff options
Diffstat (limited to 'drivers/pcmcia/m8xx_pcmcia.c')
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 6d9f71cfcb34..a7f27c3dfc24 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -823,17 +823,6 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) | |||
823 | return 0; | 823 | return 0; |
824 | } | 824 | } |
825 | 825 | ||
826 | static int m8xx_get_socket(struct pcmcia_socket *sock, socket_state_t *state) | ||
827 | { | ||
828 | int lsock = container_of(sock, struct socket_info, socket)->slot; | ||
829 | *state = socket[lsock].state; /* copy the whole structure */ | ||
830 | |||
831 | dprintk("GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, " | ||
832 | "io_irq %d, csc_mask %#2.2x\n", lsock, state->flags, | ||
833 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | ||
834 | return 0; | ||
835 | } | ||
836 | |||
837 | static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) | 826 | static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) |
838 | { | 827 | { |
839 | int lsock = container_of(sock, struct socket_info, socket)->slot; | 828 | int lsock = container_of(sock, struct socket_info, socket)->slot; |
@@ -1169,7 +1158,6 @@ static struct pccard_operations m8xx_services = { | |||
1169 | .init = m8xx_sock_init, | 1158 | .init = m8xx_sock_init, |
1170 | .suspend = m8xx_suspend, | 1159 | .suspend = m8xx_suspend, |
1171 | .get_status = m8xx_get_status, | 1160 | .get_status = m8xx_get_status, |
1172 | .get_socket = m8xx_get_socket, | ||
1173 | .set_socket = m8xx_set_socket, | 1161 | .set_socket = m8xx_set_socket, |
1174 | .set_io_map = m8xx_set_io_map, | 1162 | .set_io_map = m8xx_set_io_map, |
1175 | .set_mem_map = m8xx_set_mem_map, | 1163 | .set_mem_map = m8xx_set_mem_map, |