| Message ID | 20250530165643.141295-1-adrian.hunter@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V2] mmc: sdhci: Return void from sdhci_runtime_suspend_host() and sdhci_runtime_resume_host() | expand |
On Fri, 30 May 2025 at 18:57, Adrian Hunter <adrian.hunter@intel.com> wrote: > > It does not seem like these functions will ever need the return value, > which is presently always zero. > > Simplify the usage by making the return type 'void' instead. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Applied for next, thanks! Kind regards Uffe > --- > > > Changes in V2: > > Fix warning reported by kernel test robot: > drivers/mmc/host/sdhci-esdhc-imx.c:2103:6: > warning: variable 'ret' is used uninitialized > whenever 'if' condition is false > [-Wsometimes-uninitialized] > > > drivers/mmc/host/sdhci-acpi.c | 8 +++----- > drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++--------- > drivers/mmc/host/sdhci-of-at91.c | 8 ++++---- > drivers/mmc/host/sdhci-pci-core.c | 19 ++++--------------- > drivers/mmc/host/sdhci-pxav3.c | 8 +++----- > drivers/mmc/host/sdhci-s3c.c | 10 ++++------ > drivers/mmc/host/sdhci-xenon.c | 9 ++------- > drivers/mmc/host/sdhci.c | 8 ++------ > drivers/mmc/host/sdhci.h | 4 ++-- > drivers/mmc/host/sdhci_am654.c | 8 ++------ > 10 files changed, 29 insertions(+), 65 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c > index e6c5c82f64fa..d04c633f2b59 100644 > --- a/drivers/mmc/host/sdhci-acpi.c > +++ b/drivers/mmc/host/sdhci-acpi.c > @@ -1028,14 +1028,11 @@ static int sdhci_acpi_runtime_suspend(struct device *dev) > { > struct sdhci_acpi_host *c = dev_get_drvdata(dev); > struct sdhci_host *host = c->host; > - int ret; > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - return ret; > + sdhci_runtime_suspend_host(host); > > sdhci_acpi_reset_signal_voltage_if_needed(dev); > return 0; > @@ -1047,7 +1044,8 @@ static int sdhci_acpi_runtime_resume(struct device *dev) > > sdhci_acpi_byt_setting(&c->pdev->dev); > > - return sdhci_runtime_resume_host(c->host, 0); > + sdhci_runtime_resume_host(c->host, 0); > + return 0; > } > > #endif > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index ac187a8798b7..089ed0ccd9c4 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -2106,9 +2106,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) > return ret; > } > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - return ret; > + sdhci_runtime_suspend_host(host); > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > @@ -2122,7 +2120,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) > if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS) > cpu_latency_qos_remove_request(&imx_data->pm_qos_req); > > - return ret; > + return 0; > } > > static int sdhci_esdhc_runtime_resume(struct device *dev) > @@ -2152,17 +2150,13 @@ static int sdhci_esdhc_runtime_resume(struct device *dev) > > esdhc_pltfm_set_clock(host, imx_data->actual_clock); > > - err = sdhci_runtime_resume_host(host, 0); > - if (err) > - goto disable_ipg_clk; > + sdhci_runtime_resume_host(host, 0); > > if (host->mmc->caps2 & MMC_CAP2_CQE) > err = cqhci_resume(host->mmc); > > return err; > > -disable_ipg_clk: > - clk_disable_unprepare(imx_data->clk_ipg); > disable_per_clk: > clk_disable_unprepare(imx_data->clk_per); > disable_ahb_clk: > diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c > index 97988ed37467..8f12ba6a4f90 100644 > --- a/drivers/mmc/host/sdhci-of-at91.c > +++ b/drivers/mmc/host/sdhci-of-at91.c > @@ -251,9 +251,8 @@ static int sdhci_at91_runtime_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host); > - int ret; > > - ret = sdhci_runtime_suspend_host(host); > + sdhci_runtime_suspend_host(host); > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > @@ -262,7 +261,7 @@ static int sdhci_at91_runtime_suspend(struct device *dev) > clk_disable_unprepare(priv->hclock); > clk_disable_unprepare(priv->mainck); > > - return ret; > + return 0; > } > > static int sdhci_at91_runtime_resume(struct device *dev) > @@ -300,7 +299,8 @@ static int sdhci_at91_runtime_resume(struct device *dev) > } > > out: > - return sdhci_runtime_resume_host(host, 0); > + sdhci_runtime_resume_host(host, 0); > + return 0; > } > #endif /* CONFIG_PM */ > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index 13a84b9309e0..7f66d426c3c2 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -152,18 +152,15 @@ static int sdhci_pci_runtime_suspend_host(struct sdhci_pci_chip *chip) > { > struct sdhci_pci_slot *slot; > struct sdhci_host *host; > - int i, ret; > > - for (i = 0; i < chip->num_slots; i++) { > + for (int i = 0; i < chip->num_slots; i++) { > slot = chip->slots[i]; > if (!slot) > continue; > > host = slot->host; > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - goto err_pci_runtime_suspend; > + sdhci_runtime_suspend_host(host); > > if (chip->rpm_retune && > host->tuning_mode != SDHCI_TUNING_MODE_3) > @@ -171,26 +168,18 @@ static int sdhci_pci_runtime_suspend_host(struct sdhci_pci_chip *chip) > } > > return 0; > - > -err_pci_runtime_suspend: > - while (--i >= 0) > - sdhci_runtime_resume_host(chip->slots[i]->host, 0); > - return ret; > } > > static int sdhci_pci_runtime_resume_host(struct sdhci_pci_chip *chip) > { > struct sdhci_pci_slot *slot; > - int i, ret; > > - for (i = 0; i < chip->num_slots; i++) { > + for (int i = 0; i < chip->num_slots; i++) { > slot = chip->slots[i]; > if (!slot) > continue; > > - ret = sdhci_runtime_resume_host(slot->host, 0); > - if (ret) > - return ret; > + sdhci_runtime_resume_host(slot->host, 0); > } > > return 0; > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index 3fb56face3d8..450d2d0e0c39 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -525,11 +525,8 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host); > - int ret; > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - return ret; > + sdhci_runtime_suspend_host(host); > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > @@ -551,7 +548,8 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) > if (!IS_ERR(pxa->clk_core)) > clk_prepare_enable(pxa->clk_core); > > - return sdhci_runtime_resume_host(host, 0); > + sdhci_runtime_resume_host(host, 0); > + return 0; > } > #endif > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index bdf4dc0d6b77..dedc4e3a217e 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -714,9 +714,8 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_s3c *ourhost = to_s3c(host); > struct clk *busclk = ourhost->clk_io; > - int ret; > > - ret = sdhci_runtime_suspend_host(host); > + sdhci_runtime_suspend_host(host); > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > @@ -724,7 +723,7 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) > if (ourhost->cur_clk >= 0) > clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]); > clk_disable_unprepare(busclk); > - return ret; > + return 0; > } > > static int sdhci_s3c_runtime_resume(struct device *dev) > @@ -732,13 +731,12 @@ static int sdhci_s3c_runtime_resume(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_s3c *ourhost = to_s3c(host); > struct clk *busclk = ourhost->clk_io; > - int ret; > > clk_prepare_enable(busclk); > if (ourhost->cur_clk >= 0) > clk_prepare_enable(ourhost->clk_bus[ourhost->cur_clk]); > - ret = sdhci_runtime_resume_host(host, 0); > - return ret; > + sdhci_runtime_resume_host(host, 0); > + return 0; > } > #endif > > diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c > index 098f0ea45cbe..15a76f8accea 100644 > --- a/drivers/mmc/host/sdhci-xenon.c > +++ b/drivers/mmc/host/sdhci-xenon.c > @@ -648,11 +648,8 @@ static int xenon_runtime_suspend(struct device *dev) > struct sdhci_host *host = dev_get_drvdata(dev); > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host); > - int ret; > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - return ret; > + sdhci_runtime_suspend_host(host); > > if (host->tuning_mode != SDHCI_TUNING_MODE_3) > mmc_retune_needed(host->mmc); > @@ -687,9 +684,7 @@ static int xenon_runtime_resume(struct device *dev) > priv->restore_needed = false; > } > > - ret = sdhci_runtime_resume_host(host, 0); > - if (ret) > - goto out; > + sdhci_runtime_resume_host(host, 0); > return 0; > out: > clk_disable_unprepare(pltfm_host->clk); > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 32fa0b2bb912..9e0941f5023a 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3863,7 +3863,7 @@ int sdhci_resume_host(struct sdhci_host *host) > > EXPORT_SYMBOL_GPL(sdhci_resume_host); > > -int sdhci_runtime_suspend_host(struct sdhci_host *host) > +void sdhci_runtime_suspend_host(struct sdhci_host *host) > { > unsigned long flags; > > @@ -3880,12 +3880,10 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host) > spin_lock_irqsave(&host->lock, flags); > host->runtime_suspended = true; > spin_unlock_irqrestore(&host->lock, flags); > - > - return 0; > } > EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host); > > -int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) > +void sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) > { > struct mmc_host *mmc = host->mmc; > unsigned long flags; > @@ -3931,8 +3929,6 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) > sdhci_enable_card_detection(host); > > spin_unlock_irqrestore(&host->lock, flags); > - > - return 0; > } > EXPORT_SYMBOL_GPL(sdhci_runtime_resume_host); > > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index f9d65dd0f2b2..6ccb21e50ee4 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -879,8 +879,8 @@ bool sdhci_enable_irq_wakeups(struct sdhci_host *host); > void sdhci_disable_irq_wakeups(struct sdhci_host *host); > int sdhci_suspend_host(struct sdhci_host *host); > int sdhci_resume_host(struct sdhci_host *host); > -int sdhci_runtime_suspend_host(struct sdhci_host *host); > -int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset); > +void sdhci_runtime_suspend_host(struct sdhci_host *host); > +void sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset); > #endif > > void sdhci_cqe_enable(struct mmc_host *mmc); > diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c > index 73385ff4c0f3..e4d9faa05e11 100644 > --- a/drivers/mmc/host/sdhci_am654.c > +++ b/drivers/mmc/host/sdhci_am654.c > @@ -1082,9 +1082,7 @@ static int sdhci_am654_runtime_suspend(struct device *dev) > if (ret) > return ret; > > - ret = sdhci_runtime_suspend_host(host); > - if (ret) > - return ret; > + sdhci_runtime_suspend_host(host); > > /* disable the clock */ > clk_disable_unprepare(pltfm_host->clk); > @@ -1106,9 +1104,7 @@ static int sdhci_am654_runtime_resume(struct device *dev) > if (ret) > return ret; > > - ret = sdhci_runtime_resume_host(host, 0); > - if (ret) > - return ret; > + sdhci_runtime_resume_host(host, 0); > > ret = cqhci_resume(host->mmc); > if (ret) > -- > 2.48.1 >
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index e6c5c82f64fa..d04c633f2b59 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -1028,14 +1028,11 @@ static int sdhci_acpi_runtime_suspend(struct device *dev) { struct sdhci_acpi_host *c = dev_get_drvdata(dev); struct sdhci_host *host = c->host; - int ret; if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); - ret = sdhci_runtime_suspend_host(host); - if (ret) - return ret; + sdhci_runtime_suspend_host(host); sdhci_acpi_reset_signal_voltage_if_needed(dev); return 0; @@ -1047,7 +1044,8 @@ static int sdhci_acpi_runtime_resume(struct device *dev) sdhci_acpi_byt_setting(&c->pdev->dev); - return sdhci_runtime_resume_host(c->host, 0); + sdhci_runtime_resume_host(c->host, 0); + return 0; } #endif diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ac187a8798b7..089ed0ccd9c4 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -2106,9 +2106,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) return ret; } - ret = sdhci_runtime_suspend_host(host); - if (ret) - return ret; + sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); @@ -2122,7 +2120,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS) cpu_latency_qos_remove_request(&imx_data->pm_qos_req); - return ret; + return 0; } static int sdhci_esdhc_runtime_resume(struct device *dev) @@ -2152,17 +2150,13 @@ static int sdhci_esdhc_runtime_resume(struct device *dev) esdhc_pltfm_set_clock(host, imx_data->actual_clock); - err = sdhci_runtime_resume_host(host, 0); - if (err) - goto disable_ipg_clk; + sdhci_runtime_resume_host(host, 0); if (host->mmc->caps2 & MMC_CAP2_CQE) err = cqhci_resume(host->mmc); return err; -disable_ipg_clk: - clk_disable_unprepare(imx_data->clk_ipg); disable_per_clk: clk_disable_unprepare(imx_data->clk_per); disable_ahb_clk: diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c index 97988ed37467..8f12ba6a4f90 100644 --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c @@ -251,9 +251,8 @@ static int sdhci_at91_runtime_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host); - int ret; - ret = sdhci_runtime_suspend_host(host); + sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); @@ -262,7 +261,7 @@ static int sdhci_at91_runtime_suspend(struct device *dev) clk_disable_unprepare(priv->hclock); clk_disable_unprepare(priv->mainck); - return ret; + return 0; } static int sdhci_at91_runtime_resume(struct device *dev) @@ -300,7 +299,8 @@ static int sdhci_at91_runtime_resume(struct device *dev) } out: - return sdhci_runtime_resume_host(host, 0); + sdhci_runtime_resume_host(host, 0); + return 0; } #endif /* CONFIG_PM */ diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 13a84b9309e0..7f66d426c3c2 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -152,18 +152,15 @@ static int sdhci_pci_runtime_suspend_host(struct sdhci_pci_chip *chip) { struct sdhci_pci_slot *slot; struct sdhci_host *host; - int i, ret; - for (i = 0; i < chip->num_slots; i++) { + for (int i = 0; i < chip->num_slots; i++) { slot = chip->slots[i]; if (!slot) continue; host = slot->host; - ret = sdhci_runtime_suspend_host(host); - if (ret) - goto err_pci_runtime_suspend; + sdhci_runtime_suspend_host(host); if (chip->rpm_retune && host->tuning_mode != SDHCI_TUNING_MODE_3) @@ -171,26 +168,18 @@ static int sdhci_pci_runtime_suspend_host(struct sdhci_pci_chip *chip) } return 0; - -err_pci_runtime_suspend: - while (--i >= 0) - sdhci_runtime_resume_host(chip->slots[i]->host, 0); - return ret; } static int sdhci_pci_runtime_resume_host(struct sdhci_pci_chip *chip) { struct sdhci_pci_slot *slot; - int i, ret; - for (i = 0; i < chip->num_slots; i++) { + for (int i = 0; i < chip->num_slots; i++) { slot = chip->slots[i]; if (!slot) continue; - ret = sdhci_runtime_resume_host(slot->host, 0); - if (ret) - return ret; + sdhci_runtime_resume_host(slot->host, 0); } return 0; diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 3fb56face3d8..450d2d0e0c39 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -525,11 +525,8 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host); - int ret; - ret = sdhci_runtime_suspend_host(host); - if (ret) - return ret; + sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); @@ -551,7 +548,8 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) if (!IS_ERR(pxa->clk_core)) clk_prepare_enable(pxa->clk_core); - return sdhci_runtime_resume_host(host, 0); + sdhci_runtime_resume_host(host, 0); + return 0; } #endif diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index bdf4dc0d6b77..dedc4e3a217e 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -714,9 +714,8 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_s3c *ourhost = to_s3c(host); struct clk *busclk = ourhost->clk_io; - int ret; - ret = sdhci_runtime_suspend_host(host); + sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); @@ -724,7 +723,7 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) if (ourhost->cur_clk >= 0) clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]); clk_disable_unprepare(busclk); - return ret; + return 0; } static int sdhci_s3c_runtime_resume(struct device *dev) @@ -732,13 +731,12 @@ static int sdhci_s3c_runtime_resume(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_s3c *ourhost = to_s3c(host); struct clk *busclk = ourhost->clk_io; - int ret; clk_prepare_enable(busclk); if (ourhost->cur_clk >= 0) clk_prepare_enable(ourhost->clk_bus[ourhost->cur_clk]); - ret = sdhci_runtime_resume_host(host, 0); - return ret; + sdhci_runtime_resume_host(host, 0); + return 0; } #endif diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index 098f0ea45cbe..15a76f8accea 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -648,11 +648,8 @@ static int xenon_runtime_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host); - int ret; - ret = sdhci_runtime_suspend_host(host); - if (ret) - return ret; + sdhci_runtime_suspend_host(host); if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); @@ -687,9 +684,7 @@ static int xenon_runtime_resume(struct device *dev) priv->restore_needed = false; } - ret = sdhci_runtime_resume_host(host, 0); - if (ret) - goto out; + sdhci_runtime_resume_host(host, 0); return 0; out: clk_disable_unprepare(pltfm_host->clk); diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 32fa0b2bb912..9e0941f5023a 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3863,7 +3863,7 @@ int sdhci_resume_host(struct sdhci_host *host) EXPORT_SYMBOL_GPL(sdhci_resume_host); -int sdhci_runtime_suspend_host(struct sdhci_host *host) +void sdhci_runtime_suspend_host(struct sdhci_host *host) { unsigned long flags; @@ -3880,12 +3880,10 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host) spin_lock_irqsave(&host->lock, flags); host->runtime_suspended = true; spin_unlock_irqrestore(&host->lock, flags); - - return 0; } EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host); -int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) +void sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) { struct mmc_host *mmc = host->mmc; unsigned long flags; @@ -3931,8 +3929,6 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset) sdhci_enable_card_detection(host); spin_unlock_irqrestore(&host->lock, flags); - - return 0; } EXPORT_SYMBOL_GPL(sdhci_runtime_resume_host); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index f9d65dd0f2b2..6ccb21e50ee4 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -879,8 +879,8 @@ bool sdhci_enable_irq_wakeups(struct sdhci_host *host); void sdhci_disable_irq_wakeups(struct sdhci_host *host); int sdhci_suspend_host(struct sdhci_host *host); int sdhci_resume_host(struct sdhci_host *host); -int sdhci_runtime_suspend_host(struct sdhci_host *host); -int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset); +void sdhci_runtime_suspend_host(struct sdhci_host *host); +void sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset); #endif void sdhci_cqe_enable(struct mmc_host *mmc); diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c index 73385ff4c0f3..e4d9faa05e11 100644 --- a/drivers/mmc/host/sdhci_am654.c +++ b/drivers/mmc/host/sdhci_am654.c @@ -1082,9 +1082,7 @@ static int sdhci_am654_runtime_suspend(struct device *dev) if (ret) return ret; - ret = sdhci_runtime_suspend_host(host); - if (ret) - return ret; + sdhci_runtime_suspend_host(host); /* disable the clock */ clk_disable_unprepare(pltfm_host->clk); @@ -1106,9 +1104,7 @@ static int sdhci_am654_runtime_resume(struct device *dev) if (ret) return ret; - ret = sdhci_runtime_resume_host(host, 0); - if (ret) - return ret; + sdhci_runtime_resume_host(host, 0); ret = cqhci_resume(host->mmc); if (ret)
It does not seem like these functions will ever need the return value, which is presently always zero. Simplify the usage by making the return type 'void' instead. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- Changes in V2: Fix warning reported by kernel test robot: drivers/mmc/host/sdhci-esdhc-imx.c:2103:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] drivers/mmc/host/sdhci-acpi.c | 8 +++----- drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++--------- drivers/mmc/host/sdhci-of-at91.c | 8 ++++---- drivers/mmc/host/sdhci-pci-core.c | 19 ++++--------------- drivers/mmc/host/sdhci-pxav3.c | 8 +++----- drivers/mmc/host/sdhci-s3c.c | 10 ++++------ drivers/mmc/host/sdhci-xenon.c | 9 ++------- drivers/mmc/host/sdhci.c | 8 ++------ drivers/mmc/host/sdhci.h | 4 ++-- drivers/mmc/host/sdhci_am654.c | 8 ++------ 10 files changed, 29 insertions(+), 65 deletions(-)