Skip to content

Commit

Permalink
wifi: wilc1000: Fold wilc_create_wiphy() into cfg80211.c
Browse files Browse the repository at this point in the history
The wilc_create_wiphy() is not used outside of cfg80211.c .
Make the function static and remove its entry from cfg80211.h

Reviewed-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241004114551.40236-5-marex@denx.de
  • Loading branch information
Marek Vasut authored and Kalle Valo committed Oct 17, 2024
1 parent 1241c56 commit 577c04f
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 48 deletions.
94 changes: 47 additions & 47 deletions drivers/net/wireless/microchip/wilc1000/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1757,53 +1757,7 @@ void wlan_deinit_locks(struct wilc *wilc)
cleanup_srcu_struct(&wilc->srcu);
}

int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
const struct wilc_hif_func *ops)
{
struct wilc *wl;
int ret, i;

wl = wilc_create_wiphy(dev);
if (!wl)
return -EINVAL;

wlan_init_locks(wl);

ret = wilc_wlan_cfg_init(wl);
if (ret)
goto free_wl;

*wilc = wl;
wl->io_type = io_type;
wl->hif_func = ops;

for (i = 0; i < NQUEUES; i++)
INIT_LIST_HEAD(&wl->txq[i].txq_head.list);

INIT_LIST_HEAD(&wl->rxq_head.list);
INIT_LIST_HEAD(&wl->vif_list);

wl->hif_workqueue = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM,
wiphy_name(wl->wiphy));
if (!wl->hif_workqueue) {
ret = -ENOMEM;
goto free_cfg;
}

return 0;

free_cfg:
wilc_wlan_cfg_deinit(wl);

free_wl:
wlan_deinit_locks(wl);
wiphy_unregister(wl->wiphy);
wiphy_free(wl->wiphy);
return ret;
}
EXPORT_SYMBOL_GPL(wilc_cfg80211_init);

struct wilc *wilc_create_wiphy(struct device *dev)
static struct wilc *wilc_create_wiphy(struct device *dev)
{
struct wiphy *wiphy;
struct wilc *wl;
Expand Down Expand Up @@ -1861,6 +1815,52 @@ struct wilc *wilc_create_wiphy(struct device *dev)
return wl;
}

int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
const struct wilc_hif_func *ops)
{
struct wilc *wl;
int ret, i;

wl = wilc_create_wiphy(dev);
if (!wl)
return -EINVAL;

wlan_init_locks(wl);

ret = wilc_wlan_cfg_init(wl);
if (ret)
goto free_wl;

*wilc = wl;
wl->io_type = io_type;
wl->hif_func = ops;

for (i = 0; i < NQUEUES; i++)
INIT_LIST_HEAD(&wl->txq[i].txq_head.list);

INIT_LIST_HEAD(&wl->rxq_head.list);
INIT_LIST_HEAD(&wl->vif_list);

wl->hif_workqueue = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM,
wiphy_name(wl->wiphy));
if (!wl->hif_workqueue) {
ret = -ENOMEM;
goto free_cfg;
}

return 0;

free_cfg:
wilc_wlan_cfg_deinit(wl);

free_wl:
wlan_deinit_locks(wl);
wiphy_unregister(wl->wiphy);
wiphy_free(wl->wiphy);
return ret;
}
EXPORT_SYMBOL_GPL(wilc_cfg80211_init);

int wilc_init_host_int(struct net_device *net)
{
int ret;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/microchip/wilc1000/cfg80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
const struct wilc_hif_func *ops);
struct wilc *wilc_create_wiphy(struct device *dev);
void wilc_deinit_host_int(struct net_device *net);
int wilc_init_host_int(struct net_device *net);
void wilc_wfi_monitor_rx(struct net_device *mon_dev, u8 *buff, u32 size);
Expand Down

0 comments on commit 577c04f

Please sign in to comment.