summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-04 00:30:14 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-10-12 21:55:28 +0100
commitb2fcb72d9dde3b30d73d3dd0dd8967c07cbf6aec (patch)
tree4d539af1fa628e78e3fa2334bcc999c74e0713de
parenta89aa5b47f502d8d0483d9876328a30a73fe7244 (diff)
switch hx4700 to state helper
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/pcmcia/pxa2xx_hx4700.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pcmcia/pxa2xx_hx4700.c b/drivers/pcmcia/pxa2xx_hx4700.c
index 87b6a1639d94..a864b0d139ab 100644
--- a/drivers/pcmcia/pxa2xx_hx4700.c
+++ b/drivers/pcmcia/pxa2xx_hx4700.c
@@ -50,13 +50,6 @@ static void hx4700_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
gpio_free_array(gpios, ARRAY_SIZE(gpios));
}
-static void hx4700_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
- struct pcmcia_state *state)
-{
- state->vs_3v = 1;
- state->vs_Xv = 0;
-}
-
static int hx4700_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
const socket_state_t *state)
{
@@ -82,7 +75,7 @@ static struct pcmcia_low_level hx4700_pcmcia_ops = {
.nr = 1,
.hw_init = hx4700_pcmcia_hw_init,
.hw_shutdown = hx4700_pcmcia_hw_shutdown,
- .socket_state = hx4700_pcmcia_socket_state,
+ .socket_state = soc_common_cf_socket_state,
.configure_socket = hx4700_pcmcia_configure_socket,
};