github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: wcn36xx: allocate chan_surveys with main struct

Browse Source 
Avoid allocating separately with a flexible array member. Simplifies
allocation slightly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
Link: https://patch.msgid.link/20260519020317.635011-1-rosenp@gmail.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
This commit is contained in:
Rosen Penev 2026-05-18 19:03:17 -07:00 committed by Jeff Johnson
parent a969232fa3
commit 0bd50e3635
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ath/wcn36xx/main.c
View File

@ -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);

2
drivers/net/wireless/ath/wcn36xx/wcn36xx.h
View File

@ -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,