pcmcia: soc_common: Avoid using GPIOF_ACTIVE_LOW

Avoid using GPIOF_ACTIVE_LOW as it's deprecated and subject to remove.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Link: https://lore.kernel.org/r/20241104093609.156059-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 61b0c8952bb5e027a582b37d37ffc73df81aa6b2..1deb9960db3419b934b09aef599aaf1f4d25477a 100644 (file)
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -204,14 +204,8 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 
        for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {
                if (gpio_is_valid(skt->stat[i].gpio)) {
-                       unsigned long flags = GPIOF_IN;
-
-                       /* CD is active low by default */
-                       if (i == SOC_STAT_CD)
-                               flags |= GPIOF_ACTIVE_LOW;
-
                        ret = devm_gpio_request_one(skt->socket.dev.parent,
-                                                   skt->stat[i].gpio, flags,
+                                                   skt->stat[i].gpio, GPIOF_IN,
                                                    skt->stat[i].name);
                        if (ret) {
                                __soc_pcmcia_hw_shutdown(skt, i);
@@ -219,6 +213,10 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                        }
 
                        skt->stat[i].desc = gpio_to_desc(skt->stat[i].gpio);
+
+                       /* CD is active low by default */
+                       if ((i == SOC_STAT_CD) ^ gpiod_is_active_low(skt->stat[i].desc))
+                               gpiod_toggle_active_low(skt->stat[i].desc);
                }
 
                if (i < SOC_STAT_VS1 && skt->stat[i].desc) {