2022-08-21 13:26:14

by Michael Straube

[permalink] [raw]
Subject: [PATCH] staging: r8188eu: remove unused module parameter rtw_chip_version

The module parameter rtw_chip_version sets the chip_version field of
struct registry_priv but that field is never used in the driver code.
Remove the unused module parameter.

Signed-off-by: Michael Straube <[email protected]>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
drivers/staging/r8188eu/os_dep/os_intfs.c | 3 ---
2 files changed, 4 deletions(-)

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 79351b3aa60d..1bd0c8f3a358 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -37,7 +37,6 @@
#define FW_RTL8188EU "rtlwifi/rtl8188eufw.bin"

struct registry_priv {
- u8 chip_version;
u8 rfintfs;
u8 lbkmode;
u8 hci;
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 2d2a1c27d433..dd4e6aac3509 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -22,7 +22,6 @@ MODULE_FIRMWARE(FW_RTL8188EU);
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

/* module param defaults */
-static int rtw_chip_version = 0x00;
static int rtw_rfintfs = HWPI;
static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure; infra, ad-hoc, auto */
@@ -104,7 +103,6 @@ char *rtw_initmac; /* temp mac address if users want to use instead of the mac

module_param(rtw_initmac, charp, 0644);
module_param(rtw_channel_plan, int, 0644);
-module_param(rtw_chip_version, int, 0644);
module_param(rtw_rfintfs, int, 0644);
module_param(rtw_lbkmode, int, 0644);
module_param(rtw_network_mode, int, 0644);
@@ -151,7 +149,6 @@ static uint loadparam(struct adapter *padapter)
{
struct registry_priv *registry_par = &padapter->registrypriv;

- registry_par->chip_version = (u8)rtw_chip_version;
registry_par->rfintfs = (u8)rtw_rfintfs;
registry_par->lbkmode = (u8)rtw_lbkmode;
registry_par->network_mode = (u8)rtw_network_mode;
--
2.37.2


2022-08-22 18:39:01

by Philipp Hortmann

[permalink] [raw]
Subject: Re: [PATCH] staging: r8188eu: remove unused module parameter rtw_chip_version

On 8/21/22 14:31, Michael Straube wrote:
> The module parameter rtw_chip_version sets the chip_version field of
> struct registry_priv but that field is never used in the driver code.
> Remove the unused module parameter.
>
> Signed-off-by: Michael Straube <[email protected]>
> ---
> drivers/staging/r8188eu/include/drv_types.h | 1 -
> drivers/staging/r8188eu/os_dep/os_intfs.c | 3 ---
> 2 files changed, 4 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
> index 79351b3aa60d..1bd0c8f3a358 100644
> --- a/drivers/staging/r8188eu/include/drv_types.h
> +++ b/drivers/staging/r8188eu/include/drv_types.h
> @@ -37,7 +37,6 @@
> #define FW_RTL8188EU "rtlwifi/rtl8188eufw.bin"
>
> struct registry_priv {
> - u8 chip_version;
> u8 rfintfs;
> u8 lbkmode;
> u8 hci;
> diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
> index 2d2a1c27d433..dd4e6aac3509 100644
> --- a/drivers/staging/r8188eu/os_dep/os_intfs.c
> +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
> @@ -22,7 +22,6 @@ MODULE_FIRMWARE(FW_RTL8188EU);
> #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
>
> /* module param defaults */
> -static int rtw_chip_version = 0x00;
> static int rtw_rfintfs = HWPI;
> static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
> static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure; infra, ad-hoc, auto */
> @@ -104,7 +103,6 @@ char *rtw_initmac; /* temp mac address if users want to use instead of the mac
>
> module_param(rtw_initmac, charp, 0644);
> module_param(rtw_channel_plan, int, 0644);
> -module_param(rtw_chip_version, int, 0644);
> module_param(rtw_rfintfs, int, 0644);
> module_param(rtw_lbkmode, int, 0644);
> module_param(rtw_network_mode, int, 0644);
> @@ -151,7 +149,6 @@ static uint loadparam(struct adapter *padapter)
> {
> struct registry_priv *registry_par = &padapter->registrypriv;
>
> - registry_par->chip_version = (u8)rtw_chip_version;
> registry_par->rfintfs = (u8)rtw_rfintfs;
> registry_par->lbkmode = (u8)rtw_lbkmode;
> registry_par->network_mode = (u8)rtw_network_mode;

Tested-by: Philipp Hortmann <[email protected]> # Edimax N150