* [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr
@ 2023-03-11 22:27 Heiner Kallweit
2023-03-12 20:20 ` Martin Blumenstingl
2023-03-23 12:12 ` Ulf Hansson
0 siblings, 2 replies; 3+ messages in thread
From: Heiner Kallweit @ 2023-03-11 22:27 UTC (permalink / raw)
To: Ulf Hansson, Neil Armstrong, Kevin Hilman, Martin Blumenstingl,
Jerome Brunet
Cc: linux-mmc@vger.kernel.org, open list:ARM/Amlogic Meson...,
linux-arm-kernel@lists.infradead.org
After 087592395a96 ("mmc: core: Allow invalid regulator in
mmc_regulator_set_ocr()") we can remove the checks here.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/mmc/host/meson-gx-mmc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 2b963a81c..28e04dc4e 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -604,8 +604,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
*/
switch (ios->power_mode) {
case MMC_POWER_OFF:
- if (!IS_ERR(mmc->supply.vmmc))
- mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) {
regulator_disable(mmc->supply.vqmmc);
@@ -615,8 +614,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
break;
case MMC_POWER_UP:
- if (!IS_ERR(mmc->supply.vmmc))
- mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
break;
--
2.39.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr
2023-03-11 22:27 [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr Heiner Kallweit
@ 2023-03-12 20:20 ` Martin Blumenstingl
2023-03-23 12:12 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Martin Blumenstingl @ 2023-03-12 20:20 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Ulf Hansson, Neil Armstrong, Kevin Hilman, Jerome Brunet,
linux-mmc@vger.kernel.org, open list:ARM/Amlogic Meson...,
linux-arm-kernel@lists.infradead.org
On Sat, Mar 11, 2023 at 11:27 PM Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> After 087592395a96 ("mmc: core: Allow invalid regulator in
> mmc_regulator_set_ocr()") we can remove the checks here.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr
2023-03-11 22:27 [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr Heiner Kallweit
2023-03-12 20:20 ` Martin Blumenstingl
@ 2023-03-23 12:12 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2023-03-23 12:12 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Neil Armstrong, Kevin Hilman, Martin Blumenstingl, Jerome Brunet,
linux-mmc@vger.kernel.org, open list:ARM/Amlogic Meson...,
linux-arm-kernel@lists.infradead.org
On Sat, 11 Mar 2023 at 23:27, Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> After 087592395a96 ("mmc: core: Allow invalid regulator in
> mmc_regulator_set_ocr()") we can remove the checks here.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/meson-gx-mmc.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index 2b963a81c..28e04dc4e 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -604,8 +604,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> */
> switch (ios->power_mode) {
> case MMC_POWER_OFF:
> - if (!IS_ERR(mmc->supply.vmmc))
> - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
>
> if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) {
> regulator_disable(mmc->supply.vqmmc);
> @@ -615,8 +614,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> break;
>
> case MMC_POWER_UP:
> - if (!IS_ERR(mmc->supply.vmmc))
> - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
>
> break;
>
> --
> 2.39.2
>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-23 12:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-11 22:27 [PATCH] mmc: meson-gx: simplify usage of mmc_regulator_set_ocr Heiner Kallweit
2023-03-12 20:20 ` Martin Blumenstingl
2023-03-23 12:12 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox