[PATCH 3/5] mmc: slot-gpio: use gpiod_set_active_[low|high]()

Bartosz Golaszewski
2023-09-13T11:50:31Z

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

We have new, less cumbersome and clearer interfaces for controlling GPIO
polarity. Use them in the MMC code.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/mmc/core/slot-gpio.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 2a2d949a9344..a6fea6559a5e 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -204,12 +204,11 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
}

/* override forces default (active-low) polarity ... */
- if (override_active_level && !gpiod_is_active_low(desc))
- gpiod_toggle_active_low(desc);
-
+ if (override_active_level)
+ gpiod_set_active_low(desc);
/* ... or active-high */
- if (host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH)
- gpiod_toggle_active_low(desc);
+ else if (host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH)
+ gpiod_set_active_high(desc);

ctx->cd_gpio = desc;

@@ -256,7 +255,7 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
}

if (host->caps2 & MMC_CAP2_RO_ACTIVE_HIGH)
- gpiod_toggle_active_low(desc);
+ gpiod_set_active_high(desc);

ctx->ro_gpio = desc;

--
2.39.2