Commit 1c3d038b authored by Russell King's avatar Russell King
Browse files

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a7670151

drivers/pcmcia/pxa2xx_balloon3.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/pcmcia/pxa2xx_cm_x255.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

}

drivers/pcmcia/pxa2xx_cm_x270.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

}

drivers/pcmcia/pxa2xx_colibri.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/pcmcia/pxa2xx_e740.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}