From 2272c841ee301402ea7a01fc727619af1f97f0cc Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Tue, 26 Apr 2016 17:55:27 +0200 Subject: [PATCH] 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 Acked-by: Arnd Bergmann Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mobile_sdhi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 9c9bbb25892a..04f15d9a36c5 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) -- 2.20.1