diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 08:49:46 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-22 09:39:01 +0100 |
| commit | a1d0500261e788f9b1d068e3167b2a77ad0abfc4 (patch) | |
| tree | d9b98466428f41f3df211bf65cd414c690abada6 /drivers/pcmcia/sa1100_assabet.c | |
| parent | 6ac95d821216f3baab16821a893d52ab385824be (diff) | |
pcmcia: soc_common: add CF socket state helper
Add a helper to get the voltage state of CF sockets, where the voltage
sense pins are not wired up. Switch assabet and cerf to use this
helper.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa1100_assabet.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_assabet.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c index 44cfc4416e54..71ace6910d7e 100644 --- a/drivers/pcmcia/sa1100_assabet.c +++ b/drivers/pcmcia/sa1100_assabet.c @@ -31,13 +31,6 @@ static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt) return 0; } -static void -assabet_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state) -{ - state->vs_3v = 1; /* Can only apply 3.3V on Assabet. */ - state->vs_Xv = 0; -} - static int assabet_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state) { @@ -90,7 +83,7 @@ static void assabet_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) static struct pcmcia_low_level assabet_pcmcia_ops = { .owner = THIS_MODULE, .hw_init = assabet_pcmcia_hw_init, - .socket_state = assabet_pcmcia_socket_state, + .socket_state = soc_common_cf_socket_state, .configure_socket = assabet_pcmcia_configure_socket, .socket_suspend = assabet_pcmcia_socket_suspend, }; |