* [PATCH 1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"
2021-12-09 4:44 [PATCH 0/4] wilc1000: use Linux-style for system-visible names David Mosberger-Tang
@ 2021-12-09 4:44 ` David Mosberger-Tang
2021-12-14 18:46 ` Kalle Valo
2021-12-09 4:44 ` [PATCH 2/4] wilc1000: Rename irq handler from "WILC_IRQ" to netdev name David Mosberger-Tang
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: David Mosberger-Tang @ 2021-12-09 4:44 UTC (permalink / raw)
To: Ajay Singh
Cc: Claudiu Beznea, Kalle Valo, David S. Miller, Jakub Kicinski,
linux-wireless, netdev, linux-kernel, David Mosberger-Tang
The name "wilc1000_spi" follows normal Linux conventions and also is
analogous to the SDIO driver, which uses "wilc1000_sdio".
Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
drivers/net/wireless/microchip/wilc1000/spi.c | 4 +++-
drivers/net/wireless/microchip/wilc1000/wlan.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
index 640850f989dd..69c901395329 100644
--- a/drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -12,6 +12,8 @@
#include "netdev.h"
#include "cfg80211.h"
+#define SPI_MODALIAS "wilc1000_spi"
+
static bool enable_crc7; /* protect SPI commands with CRC7 */
module_param(enable_crc7, bool, 0644);
MODULE_PARM_DESC(enable_crc7,
@@ -205,7 +207,7 @@ MODULE_DEVICE_TABLE(of, wilc_of_match);
static struct spi_driver wilc_spi_driver = {
.driver = {
- .name = MODALIAS,
+ .name = SPI_MODALIAS,
.of_match_table = wilc_of_match,
},
.probe = wilc_bus_probe,
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h
index 13fde636aa0e..eb7978166d73 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.h
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.h
@@ -213,8 +213,6 @@
#define WILC_RX_BUFF_SIZE (96 * 1024)
#define WILC_TX_BUFF_SIZE (64 * 1024)
-#define MODALIAS "WILC_SPI"
-
#define NQUEUES 4
#define AC_BUFFER_SIZE 1000
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"
2021-12-09 4:44 ` [PATCH 1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi" David Mosberger-Tang
@ 2021-12-14 18:46 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2021-12-14 18:46 UTC (permalink / raw)
To: David Mosberger-Tang
Cc: Ajay Singh, Claudiu Beznea, Kalle Valo, David S. Miller,
Jakub Kicinski, linux-wireless, netdev, linux-kernel,
David Mosberger-Tang
David Mosberger-Tang <davidm@egauge.net> wrote:
> The name "wilc1000_spi" follows normal Linux conventions and also is
> analogous to the SDIO driver, which uses "wilc1000_sdio".
>
> Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
4 patches applied to wireless-drivers-next.git, thanks.
4347d34e6a76 wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"
30e08bc0a94c wilc1000: Rename irq handler from "WILC_IRQ" to netdev name
3cc23932ba2a wilc1000: Rename tx task from "K_TXQ_TASK" to NETDEV-tx
09ed8bfc5215 wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq"
--
https://patchwork.kernel.org/project/linux-wireless/patch/20211209044411.3482259-2-davidm@egauge.net/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/4] wilc1000: Rename irq handler from "WILC_IRQ" to netdev name
2021-12-09 4:44 [PATCH 0/4] wilc1000: use Linux-style for system-visible names David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi" David Mosberger-Tang
@ 2021-12-09 4:44 ` David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 3/4] wilc1000: Rename tx task from "K_TXQ_TASK" to NETDEV-tx David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 4/4] wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq" David Mosberger-Tang
3 siblings, 0 replies; 6+ messages in thread
From: David Mosberger-Tang @ 2021-12-09 4:44 UTC (permalink / raw)
To: Ajay Singh
Cc: Claudiu Beznea, Kalle Valo, David S. Miller, Jakub Kicinski,
linux-wireless, netdev, linux-kernel, David Mosberger-Tang
This change follows normal Linux convention and the new name is more
useful since it'll be clear which irq handler statistics correspond to
which net device.
Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
drivers/net/wireless/microchip/wilc1000/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index 690572e01a2a..fae6b364ce5c 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -56,7 +56,7 @@ static int init_irq(struct net_device *dev)
ret = request_threaded_irq(wl->dev_irq_num, isr_uh_routine,
isr_bh_routine,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- "WILC_IRQ", wl);
+ dev->name, wl);
if (ret) {
netdev_err(dev, "Failed to request IRQ [%d]\n", ret);
return ret;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] wilc1000: Rename tx task from "K_TXQ_TASK" to NETDEV-tx
2021-12-09 4:44 [PATCH 0/4] wilc1000: use Linux-style for system-visible names David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi" David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 2/4] wilc1000: Rename irq handler from "WILC_IRQ" to netdev name David Mosberger-Tang
@ 2021-12-09 4:44 ` David Mosberger-Tang
2021-12-09 4:44 ` [PATCH 4/4] wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq" David Mosberger-Tang
3 siblings, 0 replies; 6+ messages in thread
From: David Mosberger-Tang @ 2021-12-09 4:44 UTC (permalink / raw)
To: Ajay Singh
Cc: Claudiu Beznea, Kalle Valo, David S. Miller, Jakub Kicinski,
linux-wireless, netdev, linux-kernel, David Mosberger-Tang
This follows normal Linux conventions and is also more useful because
the netdevice name is part of the task name (e.g., "wlan0-tx" for
network device "wlan0").
Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
drivers/net/wireless/microchip/wilc1000/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index fae6b364ce5c..e3b7629b9410 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -468,7 +468,7 @@ static int wlan_initialize_threads(struct net_device *dev)
struct wilc *wilc = vif->wilc;
wilc->txq_thread = kthread_run(wilc_txq_task, (void *)wilc,
- "K_TXQ_TASK");
+ "%s-tx", dev->name);
if (IS_ERR(wilc->txq_thread)) {
netdev_err(dev, "couldn't create TXQ thread\n");
wilc->close = 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq"
2021-12-09 4:44 [PATCH 0/4] wilc1000: use Linux-style for system-visible names David Mosberger-Tang
` (2 preceding siblings ...)
2021-12-09 4:44 ` [PATCH 3/4] wilc1000: Rename tx task from "K_TXQ_TASK" to NETDEV-tx David Mosberger-Tang
@ 2021-12-09 4:44 ` David Mosberger-Tang
3 siblings, 0 replies; 6+ messages in thread
From: David Mosberger-Tang @ 2021-12-09 4:44 UTC (permalink / raw)
To: Ajay Singh
Cc: Claudiu Beznea, Kalle Valo, David S. Miller, Jakub Kicinski,
linux-wireless, netdev, linux-kernel, David Mosberger-Tang
This follows normal Linux convention and is more useful since the new
name will make it apparent which network device the work-queue is for
(e.g., the name will be "wlan0-wq" for network device "wlan0").
hif_workqueue allocation has to move from
cfg80211.c:wilc_cfg80211_init() to netdev.c:wilc_netdev_ifc_init()
because the network device name is not known until after the netdev is
registered. The move also makes sense because netdev.c is already
responsible for destroying the work queue when it is no longer needed.
Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
.../net/wireless/microchip/wilc1000/cfg80211.c | 10 +---------
drivers/net/wireless/microchip/wilc1000/netdev.c | 15 +++++++++++++--
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index dc4bfe7be378..8d8378bafd9b 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -1737,23 +1737,15 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
INIT_LIST_HEAD(&wl->rxq_head.list);
INIT_LIST_HEAD(&wl->vif_list);
- wl->hif_workqueue = create_singlethread_workqueue("WILC_wq");
- if (!wl->hif_workqueue) {
- ret = -ENOMEM;
- goto free_cfg;
- }
vif = wilc_netdev_ifc_init(wl, "wlan%d", WILC_STATION_MODE,
NL80211_IFTYPE_STATION, false);
if (IS_ERR(vif)) {
ret = PTR_ERR(vif);
- goto free_hq;
+ goto free_cfg;
}
return 0;
-free_hq:
- destroy_workqueue(wl->hif_workqueue);
-
free_cfg:
wilc_wlan_cfg_deinit(wl);
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index e3b7629b9410..19e36bf4f36c 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -962,8 +962,15 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
ret = register_netdev(ndev);
if (ret) {
- free_netdev(ndev);
- return ERR_PTR(-EFAULT);
+ ret = -EFAULT;
+ goto error;
+ }
+
+ wl->hif_workqueue = alloc_ordered_workqueue("%s-wq", WQ_MEM_RECLAIM,
+ ndev->name);
+ if (!wl->hif_workqueue) {
+ ret = -ENOMEM;
+ goto error;
}
ndev->needs_free_netdev = true;
@@ -977,6 +984,10 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
synchronize_srcu(&wl->srcu);
return vif;
+
+ error:
+ free_netdev(ndev);
+ return ERR_PTR(ret);
}
MODULE_LICENSE("GPL");
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread