diff options
Diffstat (limited to 'drivers/pcmcia/m32r_cfc.c')
-rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index 078579ae6359..071cf485e1a3 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
@@ -480,25 +480,6 @@ static int _pcc_get_status(u_short sock, u_int *value) | |||
480 | 480 | ||
481 | /*====================================================================*/ | 481 | /*====================================================================*/ |
482 | 482 | ||
483 | static int _pcc_get_socket(u_short sock, socket_state_t *state) | ||
484 | { | ||
485 | // pcc_socket_t *t = &socket[sock]; | ||
486 | |||
487 | state->flags = 0; | ||
488 | state->csc_mask = SS_DETECT; | ||
489 | state->csc_mask |= SS_READY; | ||
490 | state->io_irq = 0; | ||
491 | state->Vcc = 33; /* 3.3V fixed */ | ||
492 | state->Vpp = 33; | ||
493 | |||
494 | debug(3, "m32r_cfc: GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, " | ||
495 | "io_irq %d, csc_mask %#2.2x\n", sock, state->flags, | ||
496 | state->Vcc, state->Vpp, state->io_irq, state->csc_mask); | ||
497 | return 0; | ||
498 | } /* _get_socket */ | ||
499 | |||
500 | /*====================================================================*/ | ||
501 | |||
502 | static int _pcc_set_socket(u_short sock, socket_state_t *state) | 483 | static int _pcc_set_socket(u_short sock, socket_state_t *state) |
503 | { | 484 | { |
504 | debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " | 485 | debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " |
@@ -667,18 +648,6 @@ static int pcc_get_status(struct pcmcia_socket *s, u_int *value) | |||
667 | LOCKED(_pcc_get_status(sock, value)); | 648 | LOCKED(_pcc_get_status(sock, value)); |
668 | } | 649 | } |
669 | 650 | ||
670 | static int pcc_get_socket(struct pcmcia_socket *s, socket_state_t *state) | ||
671 | { | ||
672 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | ||
673 | |||
674 | if (socket[sock].flags & IS_ALIVE) { | ||
675 | debug(3, "m32r_cfc: pcc_get_socket: sock(%d) -EINVAL\n", sock); | ||
676 | return -EINVAL; | ||
677 | } | ||
678 | debug(3, "m32r_cfc: pcc_get_socket: sock(%d)\n", sock); | ||
679 | LOCKED(_pcc_get_socket(sock, state)); | ||
680 | } | ||
681 | |||
682 | static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) | 651 | static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) |
683 | { | 652 | { |
684 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; | 653 | unsigned int sock = container_of(s, struct pcc_socket, socket)->number; |
@@ -724,7 +693,6 @@ static int pcc_init(struct pcmcia_socket *s) | |||
724 | static struct pccard_operations pcc_operations = { | 693 | static struct pccard_operations pcc_operations = { |
725 | .init = pcc_init, | 694 | .init = pcc_init, |
726 | .get_status = pcc_get_status, | 695 | .get_status = pcc_get_status, |
727 | .get_socket = pcc_get_socket, | ||
728 | .set_socket = pcc_set_socket, | 696 | .set_socket = pcc_set_socket, |
729 | .set_io_map = pcc_set_io_map, | 697 | .set_io_map = pcc_set_io_map, |
730 | .set_mem_map = pcc_set_mem_map, | 698 | .set_mem_map = pcc_set_mem_map, |