From: Ulf Hansson Date: Tue, 29 Oct 2024 13:17:47 +0000 (+0100) Subject: mmc: core: Simplify sd_uhs2_power_up() X-Git-Tag: v6.13-rc1~153^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=767c2b21cb5855455aeff6bd7fb76585dcab5860;p=thirdparty%2Fkernel%2Flinux.git mmc: core: Simplify sd_uhs2_power_up() Drop the redundant err-parameter and just return the result from host->ops->uhs2_control() instead. Signed-off-by: Ulf Hansson Reviewed-by: Adrian Hunter Message-ID: <20241029131752.226764-2-ulf.hansson@linaro.org> --- diff --git a/drivers/mmc/core/sd_uhs2.c b/drivers/mmc/core/sd_uhs2.c index ddd2291ad7c47..06857e1bbdb0d 100644 --- a/drivers/mmc/core/sd_uhs2.c +++ b/drivers/mmc/core/sd_uhs2.c @@ -48,8 +48,6 @@ struct sd_uhs2_wait_active_state_data { static int sd_uhs2_power_up(struct mmc_host *host) { - int err; - if (host->ios.power_mode == MMC_POWER_ON) return 0; @@ -58,9 +56,7 @@ static int sd_uhs2_power_up(struct mmc_host *host) host->ios.timing = MMC_TIMING_UHS2_SPEED_A; host->ios.power_mode = MMC_POWER_ON; - err = host->ops->uhs2_control(host, UHS2_SET_IOS); - - return err; + return host->ops->uhs2_control(host, UHS2_SET_IOS); } static int sd_uhs2_power_off(struct mmc_host *host)