| From 31f97cf9f0c31143a2a6fcc89c4a1286ce20157e Mon Sep 17 00:00:00 2001 |
| From: Marek Vasut <marex@denx.de> |
| Date: Thu, 16 Sep 2021 16:42:45 +0200 |
| Subject: rsi: Fix module dev_oper_mode parameter description |
| |
| From: Marek Vasut <marex@denx.de> |
| |
| commit 31f97cf9f0c31143a2a6fcc89c4a1286ce20157e upstream. |
| |
| The module parameters are missing dev_oper_mode 12, BT classic alone, |
| add it. Moreover, the parameters encode newlines, which ends up being |
| printed malformed e.g. by modinfo, so fix that too. |
| |
| However, the module parameter string is duplicated in both USB and SDIO |
| modules and the dev_oper_mode mode enumeration in those module parameters |
| is a duplicate of macros used by the driver. Furthermore, the enumeration |
| is confusing. |
| |
| So, deduplicate the module parameter string and use __stringify() to |
| encode the correct mode enumeration values into the module parameter |
| string. Finally, replace 'Wi-Fi' with 'Wi-Fi alone' and 'BT' with |
| 'BT classic alone' to clarify what those modes really mean. |
| |
| Fixes: 898b255339310 ("rsi: add module parameter operating mode") |
| Signed-off-by: Marek Vasut <marex@denx.de> |
| Cc: Amitkumar Karwar <amit.karwar@redpinesignals.com> |
| Cc: Angus Ainslie <angus@akkea.ca> |
| Cc: David S. Miller <davem@davemloft.net> |
| Cc: Jakub Kicinski <kuba@kernel.org> |
| Cc: Kalle Valo <kvalo@codeaurora.org> |
| Cc: Karun Eagalapati <karun256@gmail.com> |
| Cc: Martin Fuzzey <martin.fuzzey@flowbird.group> |
| Cc: Martin Kepplinger <martink@posteo.de> |
| Cc: Prameela Rani Garnepudi <prameela.j04cs@gmail.com> |
| Cc: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> |
| Cc: Siva Rebbagondla <siva8118@gmail.com> |
| Cc: netdev@vger.kernel.org |
| Cc: <stable@vger.kernel.org> # 4.17+ |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Link: https://lore.kernel.org/r/20210916144245.10181-1-marex@denx.de |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +---- |
| drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +---- |
| drivers/net/wireless/rsi/rsi_hal.h | 11 +++++++++++ |
| 3 files changed, 13 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c |
| +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c |
| @@ -24,10 +24,7 @@ |
| /* Default operating mode is wlan STA + BT */ |
| static u16 dev_oper_mode = DEV_OPMODE_STA_BT_DUAL; |
| module_param(dev_oper_mode, ushort, 0444); |
| -MODULE_PARM_DESC(dev_oper_mode, |
| - "1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" |
| - "9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" |
| - "6[AP + BT classic], 14[AP + BT classic + BT LE]"); |
| +MODULE_PARM_DESC(dev_oper_mode, DEV_OPMODE_PARAM_DESC); |
| |
| /** |
| * rsi_sdio_set_cmd52_arg() - This function prepares cmd 52 read/write arg. |
| --- a/drivers/net/wireless/rsi/rsi_91x_usb.c |
| +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c |
| @@ -25,10 +25,7 @@ |
| /* Default operating mode is wlan STA + BT */ |
| static u16 dev_oper_mode = DEV_OPMODE_STA_BT_DUAL; |
| module_param(dev_oper_mode, ushort, 0444); |
| -MODULE_PARM_DESC(dev_oper_mode, |
| - "1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" |
| - "9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" |
| - "6[AP + BT classic], 14[AP + BT classic + BT LE]"); |
| +MODULE_PARM_DESC(dev_oper_mode, DEV_OPMODE_PARAM_DESC); |
| |
| static int rsi_rx_urb_submit(struct rsi_hw *adapter, u8 ep_num, gfp_t flags); |
| |
| --- a/drivers/net/wireless/rsi/rsi_hal.h |
| +++ b/drivers/net/wireless/rsi/rsi_hal.h |
| @@ -28,6 +28,17 @@ |
| #define DEV_OPMODE_AP_BT 6 |
| #define DEV_OPMODE_AP_BT_DUAL 14 |
| |
| +#define DEV_OPMODE_PARAM_DESC \ |
| + __stringify(DEV_OPMODE_WIFI_ALONE) "[Wi-Fi alone], " \ |
| + __stringify(DEV_OPMODE_BT_ALONE) "[BT classic alone], " \ |
| + __stringify(DEV_OPMODE_BT_LE_ALONE) "[BT LE alone], " \ |
| + __stringify(DEV_OPMODE_BT_DUAL) "[BT classic + BT LE alone], " \ |
| + __stringify(DEV_OPMODE_STA_BT) "[Wi-Fi STA + BT classic], " \ |
| + __stringify(DEV_OPMODE_STA_BT_LE) "[Wi-Fi STA + BT LE], " \ |
| + __stringify(DEV_OPMODE_STA_BT_DUAL) "[Wi-Fi STA + BT classic + BT LE], " \ |
| + __stringify(DEV_OPMODE_AP_BT) "[Wi-Fi AP + BT classic], " \ |
| + __stringify(DEV_OPMODE_AP_BT_DUAL) "[Wi-Fi AP + BT classic + BT LE]" |
| + |
| #define FLASH_WRITE_CHUNK_SIZE (4 * 1024) |
| #define FLASH_SECTOR_SIZE (4 * 1024) |
| |