summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2026-05-06 16:48:48 -0700
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>2026-06-06 08:46:29 -0700
commit6a03ff9d5765ab701c12c9fc781fa6de171e1a2e (patch)
tree4538fdf56ec93a09bea4d99d78e2c5f2761775a9
parent0bd50e363581a9f833c051f7543ffd1fd3455509 (diff)
downloadlinux-6a03ff9d5765ab701c12c9fc781fa6de171e1a2e.tar.gz
linux-6a03ff9d5765ab701c12c9fc781fa6de171e1a2e.zip
wifi: ath9k_htc: use module_usb_driver
This follows the pattern with other USB Wifi drivers. There is nothing special being done in the _init and _exit functions here. Simplifies and saves some lines of code. Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> Link: https://patch.msgid.link/20260506234848.189840-1-rosenp@gmail.com Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/hif_usb.c10
-rw-r--r--drivers/net/wireless/ath/ath9k/hif_usb.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_init.c18
3 files changed, 1 insertions, 29 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 821909b81ea9..7ad85a712757 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -1530,12 +1530,4 @@ static struct usb_driver ath9k_hif_usb_driver = {
.disable_hub_initiated_lpm = 1,
};
-int ath9k_hif_usb_init(void)
-{
- return usb_register(&ath9k_hif_usb_driver);
-}
-
-void ath9k_hif_usb_exit(void)
-{
- usb_deregister(&ath9k_hif_usb_driver);
-}
+module_usb_driver(ath9k_hif_usb_driver);
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index b3e66b0485a5..c836bbe23b7a 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -136,8 +136,6 @@ struct hif_device_usb {
u8 flags; /* HIF_USB_* */
};
-int ath9k_hif_usb_init(void);
-void ath9k_hif_usb_exit(void);
void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev);
#endif /* HTC_USB_H */
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 5270d0c0af17..6de78ae85726 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -1021,21 +1021,3 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
return ret;
}
#endif
-
-static int __init ath9k_htc_init(void)
-{
- if (ath9k_hif_usb_init() < 0) {
- pr_err("No USB devices found, driver not installed\n");
- return -ENODEV;
- }
-
- return 0;
-}
-module_init(ath9k_htc_init);
-
-static void __exit ath9k_htc_exit(void)
-{
- ath9k_hif_usb_exit();
- pr_info("Driver unloaded\n");
-}
-module_exit(ath9k_htc_exit);