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>

diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index 12e38b497719a5201ed99ea5a9dc209256e7bea5..2ef576c5b69d06a28808f7d17e48c1ff0334ab73 100644 (file)
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -81,7 +81,6 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
        state->bvd2     = 0;    /* not available */
        state->vs_3v    = 1;    /* Always true its a CF card */
        state->vs_Xv    = 0;    /* not available */
-       state->wrprot   = 0;    /* not available */
 }
 
 static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index f90e7b1a59586e386b7a62c183c972a1cd772165..da40908b29dde1efa49cd4240d914b869bade9b8 100644 (file)
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -58,7 +58,6 @@ static void cmx255_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 {
        state->vs_3v  = 0;
        state->vs_Xv  = 0;
-       state->wrprot = 0;  /* not available */
 }
 
 

diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index efb5f132851b67d1d47dedd8ae1795fd60f51986..f59223f2307d0878bca779465f9c1ce56ffaf2f7 100644 (file)
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -48,7 +48,6 @@ static void cmx270_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 {
        state->vs_3v  = 0;
        state->vs_Xv  = 0;
-       state->wrprot = 0;  /* not available */
 }
 
 

diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
index 3565169a00f2a71bd74d358de04ecb0d25187b2c..4dee7b2a8032918ff6216134c23c8955ae5e6061 100644 (file)
--- 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,
        state->ready  = !!gpio_get_value(colibri_pcmcia_gpios[READY].gpio);
        state->bvd1   = !!gpio_get_value(colibri_pcmcia_gpios[BVD1].gpio);
        state->bvd2   = !!gpio_get_value(colibri_pcmcia_gpios[BVD2].gpio);
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c
index 24e00a503d088ca5292ceef3017ccfbf7a132675..8751a323b448e1069227a2d4d2399facea4949af 100644 (file)
--- a/drivers/pcmcia/pxa2xx_e740.c
+++ b/drivers/pcmcia/pxa2xx_e740.c
@@ -44,7 +44,6 @@ static void e740_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
        state->vs_3v  = 1;
-       state->wrprot = 0;
        state->vs_Xv  = 0;
 }
 

diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index b0ea4d3f8a1cf45fe0b6866fc14a82c31f314c92..7e32e25cdcb29d20965d2e7843bf0a8d3b8bf8a2 100644 (file)
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -83,7 +83,6 @@ static void mst_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
        state->bvd2   = (status & MST_PCMCIA_nSPKR_BVD2) ? 1 : 0;
        state->vs_3v  = (status & MST_PCMCIA_nVS1) ? 0 : 1;
        state->vs_Xv  = (status & MST_PCMCIA_nVS2) ? 0 : 1;
-       state->wrprot = 0;  /* not available */
 }
 
 static int mst_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 4bf68144c36503196d8df7f35b4fc5acf29222f9..ed7d4dbc39faf69a050d104acd79eb9b2472603a 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -47,7 +47,6 @@ static void palmld_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
        state->detect = 1; /* always inserted */
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index b32d05f86789202c1171981778dfca214e0e4ffa..81225a7a8cbbdb893bb2b3b163b4d5d8c90683f0 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -51,7 +51,6 @@ static void palmtc_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
        state->detect = 1; /* always inserted */
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c
index ee024ff0980a6327a97b77ce427f4e555de4f54d..069b6bbcf319ec8022a7474c463947ebc9581397 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmtx.c
+++ b/drivers/pcmcia/pxa2xx_palmtx.c
@@ -47,7 +47,6 @@ static void palmtx_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
        state->detect = 1; /* always inserted */
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
index e7c7eb530cb1c06011c92fc1dc1e029cead764a8..1d73c4401fdd6ecc1a3a8c171bd11379dcc322c8 100644 (file)
--- a/drivers/pcmcia/pxa2xx_stargate2.c
+++ b/drivers/pcmcia/pxa2xx_stargate2.c
@@ -54,7 +54,6 @@ static void sg2_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
        state->bvd2   = 0; /* not available */
        state->vs_3v  = 1; /* not available - voltage detect for card */
        state->vs_Xv  = 0; /* not available */
-       state->wrprot = 0; /* not available - write protect */
 }
 
 static int sg2_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,

diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index 31fd9344991388dc56f7db5419aeb4e8eacb5248..d326ba1fa1ce10cbd95fd198c6968d1bea6236b3 100644 (file)
--- 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

diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index 6100ef8ce53ed87a70def137ce1c8a7e607140b3..adfae4987a42a7077242ccceedcc9af1df6b2d2d 100644 (file)
--- 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;
 }

diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c
index cf07d88255130f14c470d0622a5540571cd72807..a47dcd24a26a3eab642cc7a9671e5128f581d7a1 100644 (file)
--- a/drivers/pcmcia/pxa2xx_vpac270.c
+++ b/drivers/pcmcia/pxa2xx_vpac270.c
@@ -69,7 +69,6 @@ static void vpac270_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 static void vpac270_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index 618f546e19c10cd32067f8c905aaef469f9adbef..ba8557eea6183d0356aaf92eceeff97dd067401b 100644 (file)
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -34,7 +34,6 @@ static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 static void
 assabet_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 {
-       state->wrprot = 0; /* Not available on Assabet. */
        state->vs_3v  = 1; /* Can only apply 3.3V on Assabet. */
        state->vs_Xv  = 0;
 }

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index 50df0e682b68c7373f9796c4bf68d0d3ca91c4c6..c59c44921a3a94f7093850660fd644c8b465a826 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -48,7 +48,6 @@ static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 static void
 cerf_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 {
-       state->wrprot   = 0;
        state->vs_3v    = 1;
        state->vs_Xv    = 0;
 }

diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index 410a636dbfc8908a548206ef60dc104756ce37c1..d9c7337b909ce3fb06b0609aa4eef81bf2cf5e28 100644 (file)
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -96,7 +96,6 @@ h3600_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *st
 {
        state->bvd1 = 0;
        state->bvd2 = 0;
-       state->wrprot = 0; /* Not available on H3600. */
        state->vs_3v = 0;
        state->vs_Xv = 0;
 }

diff --git a/drivers/pcmcia/sa1100_nanoengine.c b/drivers/pcmcia/sa1100_nanoengine.c
index cb43e39aef3f4cfb1aa4f486004ba96fe66a9460..35c30ff41e817cf5d92dc2d84a2f6efacfadad4c 100644 (file)
--- a/drivers/pcmcia/sa1100_nanoengine.c
+++ b/drivers/pcmcia/sa1100_nanoengine.c
@@ -106,7 +106,6 @@ static void nanoengine_pcmcia_socket_state(
 
        state->bvd1 = 1;
        state->bvd2 = 1;
-       state->wrprot = 0; /* Not available */
        state->vs_3v = 1; /* Can only apply 3.3V */
        state->vs_Xv = 0;
 }

diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index 7552d8591a29992304510a6310cc0db58e969d5d..decb34730bcf436b8aa097b086b1723f8e6b21af 100644 (file)
--- a/drivers/pcmcia/sa1100_shannon.c
+++ b/drivers/pcmcia/sa1100_shannon.c
@@ -44,7 +44,6 @@ shannon_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 {
        switch (skt->nr) {
        case 0:
-               state->wrprot = 0; /* Not available on Shannon. */
                state->bvd1   = 1; 
                state->bvd2   = 1; 
                state->vs_3v  = 1; /* FIXME Can only apply 3.3V on Shannon. */
@@ -52,7 +51,6 @@ shannon_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                break;
 
        case 1:
-               state->wrprot = 0; /* Not available on Shannon. */
                state->bvd1   = 1; 
                state->bvd2   = 1; 
                state->vs_3v  = 1; /* FIXME Can only apply 3.3V on Shannon. */

diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 39d2241b9d8023a494c103eb17ff3a1e1ec2f6d0..8647b17c449ef79183a3d42f73a045f42e26e965 100644 (file)
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -46,7 +46,6 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 
        state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
        state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */
-       state->wrprot=0; /* Not available on Simpad. */
 
        if ((cs3reg & (PCMCIA_VS1|PCMCIA_VS2)) ==
                        (PCMCIA_VS1|PCMCIA_VS2)) {