summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-11-28 14:57:23 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2018-12-04 23:37:38 +0100
commit57c1cdce7121946800c0e30fa44904a88e8cc542 (patch)
treeb211d4851022d669c72c56238067a2880f8feed8 /drivers/pcmcia
parentARM: pxa/lubbock: switch PCMCIA to MAX1600 library (diff)
downloadlinux-57c1cdce7121946800c0e30fa44904a88e8cc542.tar.xz
linux-57c1cdce7121946800c0e30fa44904a88e8cc542.zip
pcmcia: sa1100*: remove redundant bvd1/bvd2 setting
bvd1 and bvd2 both default to 1 in the generic soc_common code, so having a driver repeat this is redundant. Remove it. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/sa1100_simpad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index e235ee14eaa6..e2e8729afd9d 100644
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -39,8 +39,8 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
{
long cs3reg = simpad_get_cs3_ro();
- state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
- state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */
+ /* bvd1 might be cs3reg & PCMCIA_BVD1 */
+ /* bvd2 might be cs3reg & PCMCIA_BVD2 */
if ((cs3reg & (PCMCIA_VS1|PCMCIA_VS2)) ==
(PCMCIA_VS1|PCMCIA_VS2)) {