summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_trizeps4.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 20:21:50 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 18:27:04 +0400
commit1c3d038bd5fb9dc868bb7474caaddc7aea4d562e (patch)
treeec853560944959c1ac0ff9a7bd4ed89a3fd4e4af /drivers/pcmcia/pxa2xx_trizeps4.c
parenta7670151a48cc54fafd8f1b4f04a1495c2f8b6f0 (diff)
downloadlinux-1c3d038bd5fb9dc868bb7474caaddc7aea4d562e.tar.xz
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_trizeps4.c')
-rw-r--r--drivers/pcmcia/pxa2xx_trizeps4.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index 31fd93449913..d326ba1fa1ce 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -75,7 +75,6 @@ static void trizeps_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
state->bvd2 = (status & ConXS_CFSR_BVD2) ? 1 : 0;
state->vs_3v = (status & ConXS_CFSR_VS1) ? 0 : 1;
state->vs_Xv = (status & ConXS_CFSR_VS2) ? 0 : 1;
- state->wrprot = 0; /* not available */
break;
#ifndef CONFIG_MACH_TRIZEPS_CONXS
@@ -87,7 +86,6 @@ static void trizeps_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
state->bvd2 = 0;
state->vs_3v = 0;
state->vs_Xv = 0;
- state->wrprot = 0;
break;
#endif