]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: rtsx_usb_sdmmc: Re-work the code in sd_set_power_mode()
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 10 Jun 2025 11:16:26 +0000 (13:16 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 24 Jun 2025 10:43:26 +0000 (12:43 +0200)
It's only at MMC_POWER_OFF and at MMC_POWER_UP when some operations must be
carried out in sd_set_power_mode(). The code is a bit obfuscated in this
regards. Let's convert it into a switch-case-clause to make this clear.

Reviewed-by: Avri Altman <avri.altman@sandisk.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Ricky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20250610111633.504366-5-ulf.hansson@linaro.org
drivers/mmc/host/rtsx_usb_sdmmc.c

index 676f08f71ec0927e9bf7f938fad14b76f5932379..b750e2166d92a08073b9b7546ebf21b48d52b0fe 100644 (file)
@@ -1015,22 +1015,30 @@ static void sd_set_power_mode(struct rtsx_usb_sdmmc *host,
 {
        int err;
 
-       if (power_mode != MMC_POWER_OFF)
-               power_mode = MMC_POWER_ON;
-
        if (power_mode == host->power_mode)
                return;
 
-       if (power_mode == MMC_POWER_OFF) {
+       switch (power_mode) {
+       case MMC_POWER_OFF:
                err = sd_power_off(host);
                if (err)
                        dev_dbg(sdmmc_dev(host), "power-off (err = %d)\n", err);
                pm_runtime_put_noidle(sdmmc_dev(host));
-       } else {
+               break;
+
+       case MMC_POWER_UP:
                pm_runtime_get_noresume(sdmmc_dev(host));
                err = sd_power_on(host);
                if (err)
                        dev_dbg(sdmmc_dev(host), "power-on (err = %d)\n", err);
+               break;
+
+       case MMC_POWER_ON:
+       case MMC_POWER_UNDEFINED:
+               break;
+
+       default:
+               break;
        }
 
        host->power_mode = power_mode;