Merge tag 'dm-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[cascardo/linux.git] / drivers / pcmcia / sa1100_cerf.c

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index b3774e5..c3f6736 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -45,13 +45,6 @@ static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
        gpio_free(CERF_GPIO_CF_RESET);
 }
 
-static void
-cerf_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
-{
-       state->vs_3v    = 1;
-       state->vs_Xv    = 0;
-}
-
 static int
 cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                             const socket_state_t *state)
@@ -77,7 +70,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
        .owner                  = THIS_MODULE,
        .hw_init                = cerf_pcmcia_hw_init,
        .hw_shutdown            = cerf_pcmcia_hw_shutdown,
-       .socket_state           = cerf_pcmcia_socket_state,
+       .socket_state           = soc_common_cf_socket_state,
        .configure_socket       = cerf_pcmcia_configure_socket,
 };