summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2016-04-26 17:55:27 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2016-05-02 10:33:40 +0200
commit2272c841ee301402ea7a01fc727619af1f97f0cc (patch)
tree6fd8a24b57a54930be99068c8b149b966fade52e
parentac86045ee9cd89774030ff1c21c7ff35f1c1eeaa (diff)
downloadop-kernel-dev-2272c841ee301402ea7a01fc727619af1f97f0cc.zip
op-kernel-dev-2272c841ee301402ea7a01fc727619af1f97f0cc.tar.gz
mmc: sh_mobile_sdhi: simplify code for voltage switching
A last minute fix applied by Ulf made room for some simplification. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 9c9bbb2..04f15d9 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -238,11 +238,7 @@ static int sh_mobile_sdhi_start_signal_voltage_switch(struct mmc_host *mmc,
if (ret)
return ret;
- ret = pinctrl_select_state(priv->pinctrl, pin_state);
- if (ret)
- return ret;
-
- return 0;
+ return pinctrl_select_state(priv->pinctrl, pin_state);
}
static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
OpenPOWER on IntegriCloud