From: Rosen Penev <rosenp@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: Loic Poulain <loic.poulain@oss.qualcomm.com>,
wcn36xx@lists.infradead.org (open list:QUALCOMM WCN36XX WIRELESS
DRIVER), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH wireless-next] wifi: wcn36xx: allocate chan_surveys with main struct
Date: Mon, 18 May 2026 19:03:17 -0700 [thread overview]
Message-ID: <20260519020317.635011-1-rosenp@gmail.com> (raw)
Avoid allocating separately with a flexible array member. Simplifies
allocation slightly.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/wireless/ath/wcn36xx/main.c | 13 ++-----------
drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +-
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index c3f0860873de..ad8a4bd910d2 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1568,7 +1568,8 @@ static int wcn36xx_probe(struct platform_device *pdev)
wcnss = dev_get_drvdata(pdev->dev.parent);
- hw = ieee80211_alloc_hw(sizeof(struct wcn36xx), &wcn36xx_ops);
+ n_channels = wcn_band_2ghz.n_channels + wcn_band_5ghz.n_channels;
+ hw = ieee80211_alloc_hw(struct_size(wcn, chan_survey, n_channels), &wcn36xx_ops);
if (!hw) {
wcn36xx_err("failed to alloc hw\n");
ret = -ENOMEM;
@@ -1590,16 +1591,6 @@ static int wcn36xx_probe(struct platform_device *pdev)
goto out_wq;
}
- n_channels = wcn_band_2ghz.n_channels + wcn_band_5ghz.n_channels;
- wcn->chan_survey = devm_kcalloc(wcn->dev,
- n_channels,
- sizeof(struct wcn36xx_chan_survey),
- GFP_KERNEL);
- if (!wcn->chan_survey) {
- ret = -ENOMEM;
- goto out_wq;
- }
-
ret = dma_set_mask_and_coherent(wcn->dev, DMA_BIT_MASK(32));
if (ret < 0) {
wcn36xx_err("failed to set DMA mask: %d\n", ret);
diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
index 7ee79593cd23..8c43f67bd780 100644
--- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
+++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
@@ -298,7 +298,7 @@ struct wcn36xx {
struct ieee80211_channel *channel;
spinlock_t survey_lock; /* protects chan_survey */
- struct wcn36xx_chan_survey *chan_survey;
+ struct wcn36xx_chan_survey chan_survey[];
};
static inline bool wcn36xx_is_fw_version(struct wcn36xx *wcn,
--
2.54.0
next reply other threads:[~2026-05-19 2:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-19 2:03 Rosen Penev [this message]
2026-06-06 13:28 ` [PATCH wireless-next] wifi: wcn36xx: allocate chan_surveys with main struct Loic Poulain
2026-06-06 15:53 ` Jeff Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260519020317.635011-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=loic.poulain@oss.qualcomm.com \
--cc=wcn36xx@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox