From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46DC462809 for ; Wed, 6 May 2026 23:49:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778111348; cv=none; b=uBJPhHkg873C82Cl0EYv9R+TiltVTdmBZc5TM2EHFIY9EcK1WP93DBRY6wpjlhEx/TiR56eiIfO2d+QRp45a10l/B6imf91RpynIsLkZYWTLDBDDTnHh12xQ4kIVAiQF96gAGgjUnDdrJEMRUGshJlx0GMGW3BWCbipgZTxyASo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778111348; c=relaxed/simple; bh=Z4bytMVYePXqONZsifEH8qNJARoWqBYwmzfkG84+Yok=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LDyqHg4Ck26QOiXep/Kh7rz9nh2kbJke4asTXSh9nstFQpqriZBo7h7PPxE6VA2VPMFHOO6qHHIe6bs6Va/Rcz2W+Y2Kqs+6MLpvQ7mUUVPFUjcpVKkA5k+oOKQtByujumIjMWixAYT87+AiB3JvmG6Ibk34Wq6zLVvxaT+J73c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AnD4ZoM0; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AnD4ZoM0" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-83975e992e1so65043b3a.2 for ; Wed, 06 May 2026 16:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778111347; x=1778716147; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4c1t/cGflcyf51//1AN5dSxXV4n4B5RD0CTc3t+wbU8=; b=AnD4ZoM0UwoM0By+rhWcj9yxERVbw9OByKDos9S3lqjqvvfYw5bUanH/H2cm7J6H9A LEn4olhO1OX2NxYkker/T5HwFKvcH73f69Rm+VL9xcGeST0QiWv4PwdbX0TTkhTx5R3N d8n84NBqHvBLRdeTiwgS5Ya59k8MURgWPsALthg1DhYvxfxvWLG7QlXT8zpWm6l2v+zt /OBREQlqrQPy8ehoMdRpiBIFIFx43/hROpwecR4GMvgrfSKAvCnMHvus9Es45jcmtXVA w7O2KXJLiX2JCpeemvgCV0CJ6oUsDbUxFmwAGbcAQpaEKBPRJTktrJzD795b9e1w+ByY kimA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778111347; x=1778716147; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4c1t/cGflcyf51//1AN5dSxXV4n4B5RD0CTc3t+wbU8=; b=sQB92tOSUAh/K6pyDCQySKr/siSK8Ra0vcblyKYSDZNXDJAgARhxu6esYk+YBvi0PZ lCD81tTWl8T6v+9cTMtntJIExtorXHRbqqy0KU4bZ1LVffA5/umsHHlEi54+XSQ0um+r aMTGW3YVzFzsJTkVUL3GXUYg5OFFNdDJpBww5xw3nAXe64fdvDHDeShohnanfa3Eoih8 R+pK6oCpAjaIfclEY2BAJ2Xbn+zBRH8Rr0mTepHnPO59+NCwJv4dFqp9tEXKKsuulzk1 DcMzjnn7lGz+3WsbwX8JioQDZo49eumvuevBFs1sKJRmWL4XVdHBao5TsmzqruxIEML+ 3ofg== X-Forwarded-Encrypted: i=1; AFNElJ+qYMXqG4ddZlPjxG4QvgfoMjwowkxfbRCKU6SOPBQdmHWRZdJrqaesfCYoM2tk5aECDVMcZYWfVe+qULA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/Z0+FCDgAigHFCFj7WbMG/v/OMdEADQrIvbEvm+toHGXRtxAl FlB+UV7mH0UuWobpa6Q9e89xm6PooS5S9qA78RfYiZDJnKmYh7OEvJvd1qUcJ8/M X-Gm-Gg: AeBDietX2Ikfu9ayfgWNN8u6BwL9cvNFNIrQk+Mc7qCagdYhpiazt1lxuA13cPqmLkg OnxG3cFbmcc0ZutsCgyPrELmrc6AmjCFjz+ugZLCacMDLpybWkCq/VJSOTP5UoLMlIhv8JcQ0Gs R/uIUhH6tiEZTPVelTLWsKZ0E/VksXFsnLYYcRd5Nw3m6HIexPvnZddzTVkd69KJf9IVcXkmCDY 7nDja4Zw/7jCUTkHMXOLyRayhEmOZ80cI11tyl/jObY70ieBwEV7tzFmTCdZImZC5XRF4nM+aEL m5vbasRjS7wYtz6YTOkf8d71SvWuhPMiKkEsa4OdtaB8hMVQlLag5hwRCH+3nObBZzhFBqwBZ+j +ikhrYWBvEMzybx0Ov4/LuWqZtSyr2xQ2f7ktaNWs9+zXmQ5LXbkPMyC/e7k1rzsQ5zyi/iFyod rEVfaHGYOK6MqhiNShO2lsOb62in+6DtE8X3ukF50cG3aPeadcQoZnau9JeuARuGW5bG66SXKv0 lbf7J5P0SQ1KzVW13L1Jt1SUC33+/3S1xpoVtASFZui9Q== X-Received: by 2002:a05:6a00:3d99:b0:83a:7def:e3af with SMTP id d2e1a72fcca58-83a7defe3e2mr3770078b3a.7.1778111345854; Wed, 06 May 2026 16:49:05 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83965945c1bsm6928881b3a.15.2026.05.06.16.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 16:49:05 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2 ath-next] wifi: ath9k_htc: use module_usb_driver Date: Wed, 6 May 2026 16:48:48 -0700 Message-ID: <20260506234848.189840-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- v2: move module_usb_driver to its proper place. drivers/net/wireless/ath/ath9k/hif_usb.c | 10 +--------- drivers/net/wireless/ath/ath9k/hif_usb.h | 2 -- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 18 ------------------ 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 8ae4e5d4fa14..515267f48d80 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1520,12 +1520,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 c28033ee61ce..dc0b0fa5c325 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); -- 2.54.0