aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1100_shannon.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 11:21:50 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 09:27:04 -0500
commit1c3d038bd5fb9dc868bb7474caaddc7aea4d562e (patch)
treeec853560944959c1ac0ff9a7bd4ed89a3fd4e4af /drivers/pcmcia/sa1100_shannon.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/sa1100_shannon.c')
-rw-r--r--drivers/pcmcia/sa1100_shannon.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index 7552d8591a29..decb34730bcf 100644
--- 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,
44{ 44{
45 switch (skt->nr) { 45 switch (skt->nr) {
46 case 0: 46 case 0:
47 state->wrprot = 0; /* Not available on Shannon. */
48 state->bvd1 = 1; 47 state->bvd1 = 1;
49 state->bvd2 = 1; 48 state->bvd2 = 1;
50 state->vs_3v = 1; /* FIXME Can only apply 3.3V on Shannon. */ 49 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,
52 break; 51 break;
53 52
54 case 1: 53 case 1:
55 state->wrprot = 0; /* Not available on Shannon. */
56 state->bvd1 = 1; 54 state->bvd1 = 1;
57 state->bvd2 = 1; 55 state->bvd2 = 1;
58 state->vs_3v = 1; /* FIXME Can only apply 3.3V on Shannon. */ 56 state->vs_3v = 1; /* FIXME Can only apply 3.3V on Shannon. */