diff options
| author |   Christian Lamparter <chunkeey@gmail.com> | 2022-03-02 20:51:38 +0100 |
|---|---|---|
| committer |   Kalle Valo <quic_kvalo@quicinc.com> | 2022-03-10 17:54:41 +0200 |
| commit | 83fe43abdacf78e9fbc7cd19e74768a5434edcce (patch) | |
| tree | 09b58d58712b4800fa875f108ec2fd24fddb42f7 /drivers/net/wireless/ath/carl9170/main.c | |
| parent | carl9170: replace bitmap_zalloc with devm_bitmap_zalloc (diff) | |
| download | linux-dev-83fe43abdacf78e9fbc7cd19e74768a5434edcce.tar.xz linux-dev-83fe43abdacf78e9fbc7cd19e74768a5434edcce.zip | |
carl9170: devres ar->survey_info
driver keeps the same survey_info struct for its lifetime around.
This is used because while firmware does help by providing accounting
information of the current channel, it doesn't keep track on the
remaining channels.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/9b9a059b384f49587f4384ba47f01d3fb2115b22.1646250537.git.chunkeey@gmail.com
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index fae927ca4863..76e84adf57c1 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -1916,7 +1916,8 @@ static int carl9170_parse_eeprom(struct ar9170 *ar) if (!bands) return -EINVAL; - ar->survey = kcalloc(chans, sizeof(struct survey_info), GFP_KERNEL); + ar->survey = devm_kcalloc(&ar->udev->dev, chans, + sizeof(struct survey_info), GFP_KERNEL); if (!ar->survey) return -ENOMEM; ar->num_channels = chans; @@ -2046,9 +2047,6 @@ void carl9170_free(struct ar9170 *ar) kfree_skb(ar->rx_failover); ar->rx_failover = NULL; - kfree(ar->survey); - ar->survey = NULL; - mutex_destroy(&ar->mutex); ieee80211_free_hw(ar->hw); |