]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: ath9k: use devm for gpio_request_one()
authorRosen Penev <rosenp@gmail.com>
Wed, 31 Jul 2024 21:03:08 +0000 (14:03 -0700)
committerKalle Valo <quic_kvalo@quicinc.com>
Wed, 7 Aug 2024 08:08:41 +0000 (11:08 +0300)
Using devm_gpio_request_one() is simpler as then we don't need to call
gpio_free().

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240731210312.7622-1-rosenp@gmail.com
drivers/net/wireless/ath/ath9k/hw.c

index 5982e0db45f93e24511ef5314326248790f599e0..04a4b9ea61c3059ca18567446a9cc2d05cfd7b80 100644 (file)
@@ -2732,7 +2732,7 @@ static void ath9k_hw_gpio_cfg_soc(struct ath_hw *ah, u32 gpio, bool out,
        if (ah->caps.gpio_requested & BIT(gpio))
                return;
 
-       err = gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label);
+       err = devm_gpio_request_one(ah->dev, gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label);
        if (err) {
                ath_err(ath9k_hw_common(ah), "request GPIO%d failed:%d\n",
                        gpio, err);
@@ -2801,10 +2801,8 @@ void ath9k_hw_gpio_free(struct ath_hw *ah, u32 gpio)
 
        WARN_ON(gpio >= ah->caps.num_gpio_pins);
 
-       if (ah->caps.gpio_requested & BIT(gpio)) {
-               gpio_free(gpio);
+       if (ah->caps.gpio_requested & BIT(gpio))
                ah->caps.gpio_requested &= ~BIT(gpio);
-       }
 }
 EXPORT_SYMBOL(ath9k_hw_gpio_free);