summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_viper.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 16:21:50 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 14:27:04 +0000
commit1c3d038bd5fb9dc868bb7474caaddc7aea4d562e (patch)
treeec853560944959c1ac0ff9a7bd4ed89a3fd4e4af /drivers/pcmcia/pxa2xx_viper.c
parenta7670151a48cc54fafd8f1b4f04a1495c2f8b6f0 (diff)
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
soc_common already initializes state.wrprot to zero, so explicitly setting wrprot to zero in the socket drivers has no additional effect. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_viper.c')
-rw-r--r--drivers/pcmcia/pxa2xx_viper.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index 6100ef8ce53e..adfae4987a42 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -81,7 +81,6 @@ static void viper_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
static void viper_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
struct pcmcia_state *state)
{
- state->wrprot = 0;
state->vs_3v = 1; /* Can only apply 3.3V */
state->vs_Xv = 0;
}