2023-03-07 20:01:05

by Martin Kaiser

Subject: [PATCH] wifi: rtl8xxxu: use module_usb_driver

We can use the module_usb_driver macro instead of open-coding the driver's
init and exit functions. This is simpler and saves some lines of code.
Other realtek wireless drivers use module_usb_driver as well.

Signed-off-by: Martin Kaiser <[email protected]>
---
.../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 20 +------------------
1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index e619ed21fbfe..58dbad9a14c2 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -7455,24 +7455,6 @@ static struct usb_driver rtl8xxxu_driver = {
.disable_hub_initiated_lpm = 1,
};

-static int __init rtl8xxxu_module_init(void)
-{
- int res;
-
- res = usb_register(&rtl8xxxu_driver);
- if (res < 0)
- pr_err(DRIVER_NAME ": usb_register() failed (%i)\n", res);
-
- return res;
-}
-
-static void __exit rtl8xxxu_module_exit(void)
-{
- usb_deregister(&rtl8xxxu_driver);
-}
-
-
MODULE_DEVICE_TABLE(usb, dev_table);

-module_init(rtl8xxxu_module_init);
-module_exit(rtl8xxxu_module_exit);
+module_usb_driver(rtl8xxxu_driver);
--
2.30.2

2023-03-08 06:21:58

by Ping-Ke Shih

Subject: RE: [PATCH] wifi: rtl8xxxu: use module_usb_driver

> -----Original Message-----
> From: Martin Kaiser <[email protected]>
> Sent: Wednesday, March 8, 2023 3:57 AM
> To: Jes Sorensen <[email protected]>; Kalle Valo <[email protected]>; David S. Miller
> <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni
> <[email protected]>
> Cc: Martin Kaiser <[email protected]>; [email protected]; [email protected];
> [email protected]
> Subject: [PATCH] wifi: rtl8xxxu: use module_usb_driver
>
> We can use the module_usb_driver macro instead of open-coding the driver's
> init and exit functions. This is simpler and saves some lines of code.
> Other realtek wireless drivers use module_usb_driver as well.
>
> Signed-off-by: Martin Kaiser <[email protected]>

Reviewed-by: Ping-Ke Shih <[email protected]>


> ---
> .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 20 +------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index e619ed21fbfe..58dbad9a14c2 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -7455,24 +7455,6 @@ static struct usb_driver rtl8xxxu_driver = {
> .disable_hub_initiated_lpm = 1,
> };
>
> -static int __init rtl8xxxu_module_init(void)
> -{
> - int res;
> -
> - res = usb_register(&rtl8xxxu_driver);
> - if (res < 0)
> - pr_err(DRIVER_NAME ": usb_register() failed (%i)\n", res);
> -
> - return res;
> -}
> -
> -static void __exit rtl8xxxu_module_exit(void)
> -{
> - usb_deregister(&rtl8xxxu_driver);
> -}
> -
> -
> MODULE_DEVICE_TABLE(usb, dev_table);
>
> -module_init(rtl8xxxu_module_init);
> -module_exit(rtl8xxxu_module_exit);
> +module_usb_driver(rtl8xxxu_driver);
> --
> 2.30.2

2023-03-08 23:06:02

by Philipp Hortmann

Subject: Re: [PATCH] wifi: rtl8xxxu: use module_usb_driver

On Tue, Mar 07, 2023 at 08:57:17PM +0100, Martin Kaiser wrote:
> We can use the module_usb_driver macro instead of open-coding the driver's
> init and exit functions. This is simpler and saves some lines of code.
> Other realtek wireless drivers use module_usb_driver as well.
>
> Signed-off-by: Martin Kaiser <[email protected]>
> ---
> .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 20 +------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index e619ed21fbfe..58dbad9a14c2 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -7455,24 +7455,6 @@ static struct usb_driver rtl8xxxu_driver = {
> .disable_hub_initiated_lpm = 1,
> };
>
> -static int __init rtl8xxxu_module_init(void)
> -{
> - int res;
> -
> - res = usb_register(&rtl8xxxu_driver);
> - if (res < 0)
> - pr_err(DRIVER_NAME ": usb_register() failed (%i)\n", res);
> -
> - return res;
> -}
> -
> -static void __exit rtl8xxxu_module_exit(void)
> -{
> - usb_deregister(&rtl8xxxu_driver);
> -}
> -
> -
> MODULE_DEVICE_TABLE(usb, dev_table);
>
> -module_init(rtl8xxxu_module_init);
> -module_exit(rtl8xxxu_module_exit);
> +module_usb_driver(rtl8xxxu_driver);
> --
> 2.30.2

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

2023-03-13 13:44:17

by Kalle Valo

Subject: Re: [PATCH] wifi: rtl8xxxu: use module_usb_driver

Martin Kaiser <[email protected]> wrote:

> We can use the module_usb_driver macro instead of open-coding the driver's
> init and exit functions. This is simpler and saves some lines of code.
> Other realtek wireless drivers use module_usb_driver as well.
>
> Signed-off-by: Martin Kaiser <[email protected]>
> Reviewed-by: Ping-Ke Shih <[email protected]>
> Tested-by: Philipp Hortmann <[email protected]> # Edimax N150

Patch applied to wireless-next.git, thanks.

0606b344021a wifi: rtl8xxxu: use module_usb_driver

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches