| Message ID | 20240731210312.7622-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8aabc03c7d226992b758a7bf5a53e05fc8a9ab01 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | net: ath9k: use devm for gpio_request_one | expand |
Rosen Penev <rosenp@gmail.com> writes: > Simpler. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> The title prefix should be "wifi:". I can fix that, no need to resend because of this.
Rosen Penev <rosenp@gmail.com> writes: > Simpler. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Rosen Penev <rosenp@gmail.com> wrote: > 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> Patch applied to ath-next branch of ath.git, thanks. 8aabc03c7d22 wifi: ath9k: use devm for gpio_request_one()
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 5982e0db45f9..04a4b9ea61c3 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -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);
Simpler. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- drivers/net/wireless/ath/ath9k/hw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)