diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-14 11:21:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-21 09:27:04 -0500 |
commit | 1c3d038bd5fb9dc868bb7474caaddc7aea4d562e (patch) | |
tree | ec853560944959c1ac0ff9a7bd4ed89a3fd4e4af /drivers/pcmcia/pxa2xx_colibri.c | |
parent | a7670151a48cc54fafd8f1b4f04a1495c2f8b6f0 (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_colibri.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_colibri.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c index 3565169a00f2..4dee7b2a8032 100644 --- a/drivers/pcmcia/pxa2xx_colibri.c +++ b/drivers/pcmcia/pxa2xx_colibri.c | |||
@@ -84,7 +84,6 @@ static void colibri_pcmcia_socket_state(struct soc_pcmcia_socket *skt, | |||
84 | state->ready = !!gpio_get_value(colibri_pcmcia_gpios[READY].gpio); | 84 | state->ready = !!gpio_get_value(colibri_pcmcia_gpios[READY].gpio); |
85 | state->bvd1 = !!gpio_get_value(colibri_pcmcia_gpios[BVD1].gpio); | 85 | state->bvd1 = !!gpio_get_value(colibri_pcmcia_gpios[BVD1].gpio); |
86 | state->bvd2 = !!gpio_get_value(colibri_pcmcia_gpios[BVD2].gpio); | 86 | state->bvd2 = !!gpio_get_value(colibri_pcmcia_gpios[BVD2].gpio); |
87 | state->wrprot = 0; | ||
88 | state->vs_3v = 1; | 87 | state->vs_3v = 1; |
89 | state->vs_Xv = 0; | 88 | state->vs_Xv = 0; |
90 | } | 89 | } |