diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-11-12 17:56:33 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-05 17:41:09 -0500 |
commit | 9da4bc6d6a38c1c3d850c046d0aee324c1a2e52a (patch) | |
tree | 2783de4a280ece6707b9b5800b82e1149b4d4f48 /drivers/pcmcia/m32r_pcc.c | |
parent | 7f316b033b36adfbdf56bfb15c13de49798ab0b2 (diff) |
[PATCH] pcmcia: remove get_socket callback
The .get_socket callback is never used by the PCMCIA core, therefore remove
it.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/m32r_pcc.c')
-rw-r--r-- | drivers/pcmcia/m32r_pcc.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 356a6fb416a1..70d5f0748d55 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
@@ -429,16 +429,6 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
429 | 429 | ||
430 | /*====================================================================*/ | 430 | /*====================================================================*/ |
431 | 431 | ||
432 | static int _pcc_get_socket(u_short sock, socket_state_t *state) | ||
433 | { | ||
434 | debug(3, "m32r-pcc: GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, " | ||
435 | "io_irq %d, csc_mask %#2.2x\n", sock, state->flags, | ||
436 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | ||
437 | return 0; | ||
438 | } /* _get_socket */ | ||
439 | |||
440 | /*====================================================================*/ | ||
441 | |||
442 | static int _pcc_set_socket(u_short sock, socket_state_t *state) | 432 | static int _pcc_set_socket(u_short sock, socket_state_t *state) |
443 | { | 433 | { |
444 | u_long reg = 0; | 434 | u_long reg = 0; |
@@ -641,15 +631,6 @@ static int pcc_get_status(struct pcmcia_socket *s, u_int *value) | |||
641 | LOCKED(_pcc_get_status(sock, value)); | 631 | LOCKED(_pcc_get_status(sock, value)); |
642 | } | 632 | } |
643 | 633 | ||
644 | static int pcc_get_socket(struct pcmcia_socket *s, socket_state_t *state) | ||
645 | { | ||
646 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | ||
647 | |||
648 | if (socket[sock].flags & IS_ALIVE) | ||
649 | return -EINVAL; | ||
650 | LOCKED(_pcc_get_socket(sock, state)); | ||
651 | } | ||
652 | |||
653 | static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) | 634 | static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) |
654 | { | 635 | { |
655 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 636 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
@@ -687,7 +668,6 @@ static int pcc_init(struct pcmcia_socket *s) | |||
687 | static struct pccard_operations pcc_operations = { | 668 | static struct pccard_operations pcc_operations = { |
688 | .init = pcc_init, | 669 | .init = pcc_init, |
689 | .get_status = pcc_get_status, | 670 | .get_status = pcc_get_status, |
690 | .get_socket = pcc_get_socket, | ||
691 | .set_socket = pcc_set_socket, | 671 | .set_socket = pcc_set_socket, |
692 | .set_io_map = pcc_set_io_map, | 672 | .set_io_map = pcc_set_io_map, |
693 | .set_mem_map = pcc_set_mem_map, | 673 | .set_mem_map = pcc_set_mem_map, |