From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f7.google.com (mail-pj2-f7.google.com [74.125.227.135]) (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 19AB9352010 for ; Sun, 6 Sep 2026 04:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.135 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788667331; cv=none; b=OtDe09f9Gdkw+gDtwKHly3f5ZAGVPLbvr32DLuEuyDb1tgqV501VYlUqNk2tj4mOTz0DBbSTLhMtc1NaNMb+Nq/5pllsaJVx5E+EQ0yF+onsLD7ESHd1YEfXjbT6McWnL+AQR4E7GIkJ3FQygoUpuHfubUjoYQSZ4JbKwm/6l0Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788667331; c=relaxed/simple; bh=e3kDwgTbjRMMWW/kMDqb+WZJtSvUWK03BPKsrvS7uos=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ine5W9yoThUl32wedsATFqKRPFsQKn+RFklJOAeM2Tx6gbwRSnCHuK4cpt3gOd/7yzJ138d7TUAS8eXth7gKL/rId72UZMomjJUP9mi+JEXeSUGJ/8kiuuDndRSPWwE8qRoZlSp1DJl9DkKUcB54Pt8YTg6DVEmqU61nJPeffxQ= 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=Ry1vF3i8; arc=none smtp.client-ip=74.125.227.135 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="Ry1vF3i8" Received: by mail-pj2-f7.google.com with SMTP id d9443c01a7336-2d561173f9fso14196625ad.0 for ; Sat, 05 Sep 2026 21:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788667329; x=1789272129; 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:content-type; bh=cQv+gwRX7Z+DTbRSq5jeq2W2+DL4A8UrN+ZaQRvPPtM=; b=Ry1vF3i85d3xZxYFMf9l1+18Y4eU3hfd7Mr3wvMLZ+v2cfzskYwgvDe5K1FXLsUbXQ gJgRPhCzj8HG3y8IzG0D30D59Qc2BFtJAKw4bH9RQIpBDxKlqar2oKvwRvifBGOIAO9z 6S58mJW+dSKIhL4r9X54GXUcalHHZuXIsiEqo3TXUUHUwuqkesnkEFGLjV4KtFvDnqkz TLEGWzCJTisCfgk2gwXHKZbMfyGpB4laomXANHByyVbsGgQ61GA1FnBG/S4cpvjxvpHg TYbKK4dcPl0Lz76v2Zs6cZsLsoyqay2maCdKPZmuD9N8pHle13wcofUkm4V2gAmoxMCH YfcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788667329; x=1789272129; 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:content-type; bh=cQv+gwRX7Z+DTbRSq5jeq2W2+DL4A8UrN+ZaQRvPPtM=; b=JyTlkL5ebw2RTmBKw/I4EZ0zQ5V+kQ5gM+nsbAcHkhqlvuUdI8VA+05594kYFWIVYm xPxuZM4CzhV6TFM7CEFsVQSHFmKSB+zguiSPGPGDTNYNNAA+rtmUOF1R3OH3t3jmigZL BYIKOYHpL+uaV4F23sCYH2sbay+4B7ikQczeqID25Vfm5K2ZYFWp/7wCC+xb33Y1Pe7e AoDOWSYqJejQvOIqWK4ggqdKSezptDIP74lFFm4QrGv4+n0PIPGD0HxauzxX/bsMMcbG Mts0mBKUftCPVUiJjT4z7ZC/IztzvUzcyYNRSlC49blkXA2pB47UlMyQkN1yyNiOdD/t yePg== X-Forwarded-Encrypted: i=1; AKwUvByLuaFqMzRHL+pDe+ds3UpAiWFMMjmDjQxSJWY14G68KYH9M8QP9tMR3sqBYb2TQhGP2Uta/LbqoPk=@vger.kernel.org X-Gm-Message-State: AFuF++nwuaFKjlB7K2dEDYMSnnmHsJgMEcyrnLvkhtw7YVfR6/b4RRw5 55lEBW5XjjKc9h42EmctG9QXUwJddXUEAvYknMozhwU1WxFfUbMZBbXc X-Gm-Gg: AYBFou3E44I7KbmOTR+s0R6pVT524brJAcUvPr9zMX50RmBYLJgvYpSVOmSbHOoihsj GpzLc1RiJR/JWcLahvkKe8L90PwW7CDPNgDCOM1hrrzz82Q4gXv9HCGLq9OMPWDbRUEQ5T9Jy54 GtIYVI/TdkzfhQeKRTklDC6tl247BZOSePn0jP7bS4QwMl5if7RQwI4GA2ZDHP239zkeVHN/vY5 8XHGSG3Xim8OS9LSvyVfqeuEb54FJTFYnZN7xLkHEeEHzA8EAN1lWB3EyT50E65t/y4MUxO9NZ8 MvlJW3kSEL71rx0Oj7gnXqz6UQvfIcKtwfAvh4bRWhxYaOIxhbENrTK0UvqzAlQeaBrLA9E+3Y8 UL2L27zjIm9J/6w0XRbjpzKQIQ5gAc/CcRfbgA4LIV78u9MXIOVsoJHKOw13KGR/y9qNo9z5H98 BnhnMe0oOlHudpW/of5wItfECZ6Wb3g0uhq7IsgK8b0qmA2qan8WDYvJJ15gq5kSUAhyBpvJKzg eS0CtJmn/AlhunBcya+jixWsMZ5mF9d4vnRQryAQG2Z9qyfsXrMUtAKC8Hionv40uMF9ypLeIU0 gfJULb4oDrDn2v50g2rnzbiW0XvZ8h66C6BQPqjvtd8s35Om1xkIo6w= X-Received: by 2002:a17:903:9cf:b0:2d8:d4d1:313a with SMTP id d9443c01a7336-2db12634535mr249979245ad.17.1788667329144; Sat, 05 Sep 2026 21:02:09 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3339a534152sm17127334eec.10.2026.09.05.21.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2026 21:02:08 -0700 (PDT) From: Ethan Nelson-Moore To: Kees Cook , linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org, linux-serial@vger.kernel.org Cc: Ethan Nelson-Moore , Damien Le Moal , Niklas Cassel , Russell King , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "James E.J. Bottomley" , "Martin K. Petersen" , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH] ecard: use module_driver() to avoid repeated boilerplate code Date: Sat, 5 Sep 2026 21:01:46 -0700 Message-ID: <20260906040153.105692-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Many Acorn expansion card drivers have module_init and module_exit functions that only call ecard_register_driver() and ecard_remove_driver(). The module_driver() macro automatically generates these functions given the register and unregister functions. Switch to it to simplify the code. Signed-off-by: Ethan Nelson-Moore --- drivers/ata/pata_icside.c | 13 +------------ drivers/net/ethernet/i825xx/ether1.c | 13 +------------ drivers/net/ethernet/seeq/ether3.c | 13 +------------ drivers/scsi/arm/acornscsi.c | 13 +------------ drivers/scsi/arm/arxescsi.c | 14 +------------- drivers/scsi/arm/cumana_1.c | 13 +------------ drivers/scsi/arm/cumana_2.c | 13 +------------ drivers/scsi/arm/eesox.c | 13 +------------ drivers/scsi/arm/oak.c | 14 +------------- drivers/scsi/arm/powertec.c | 13 +------------ drivers/tty/serial/8250/8250_acorn.c | 13 +------------ 11 files changed, 11 insertions(+), 134 deletions(-) diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c index 70f056e47e6b..df7203a74f45 100644 --- a/drivers/ata/pata_icside.c +++ b/drivers/ata/pata_icside.c @@ -613,19 +613,8 @@ static struct ecard_driver pata_icside_driver = { }, }; -static int __init pata_icside_init(void) -{ - return ecard_register_driver(&pata_icside_driver); -} - -static void __exit pata_icside_exit(void) -{ - ecard_remove_driver(&pata_icside_driver); -} +module_driver(pata_icside_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("ICS PATA driver"); - -module_init(pata_icside_init); -module_exit(pata_icside_exit); diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c index 3e7d7c4bafdc..d21aeb831531 100644 --- a/drivers/net/ethernet/i825xx/ether1.c +++ b/drivers/net/ethernet/i825xx/ether1.c @@ -1070,17 +1070,6 @@ static struct ecard_driver ether1_driver = { }, }; -static int __init ether1_init(void) -{ - return ecard_register_driver(ðer1_driver); -} - -static void __exit ether1_exit(void) -{ - ecard_remove_driver(ðer1_driver); -} - -module_init(ether1_init); -module_exit(ether1_exit); +module_driver(ether1_driver, ecard_register_driver, ecard_remove_driver); MODULE_LICENSE("GPL"); diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c index 20dad39b5ab9..b0d2cbc35914 100644 --- a/drivers/net/ethernet/seeq/ether3.c +++ b/drivers/net/ethernet/seeq/ether3.c @@ -882,17 +882,6 @@ static struct ecard_driver ether3_driver = { }, }; -static int __init ether3_init(void) -{ - return ecard_register_driver(ðer3_driver); -} - -static void __exit ether3_exit(void) -{ - ecard_remove_driver(ðer3_driver); -} - -module_init(ether3_init); -module_exit(ether3_exit); +module_driver(ether3_driver, ecard_register_driver, ecard_remove_driver); MODULE_LICENSE("GPL"); diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 79d7d7336b6a..8b899fbf092e 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -2902,18 +2902,7 @@ static struct ecard_driver acornscsi_driver = { }, }; -static int __init acornscsi_init(void) -{ - return ecard_register_driver(&acornscsi_driver); -} - -static void __exit acornscsi_exit(void) -{ - ecard_remove_driver(&acornscsi_driver); -} - -module_init(acornscsi_init); -module_exit(acornscsi_exit); +module_driver(acornscsi_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("AcornSCSI driver"); diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c index 925d0bd68aa5..2d3f5b0519d1 100644 --- a/drivers/scsi/arm/arxescsi.c +++ b/drivers/scsi/arm/arxescsi.c @@ -344,20 +344,8 @@ static struct ecard_driver arxescsi_driver = { }, }; -static int __init init_arxe_scsi_driver(void) -{ - return ecard_register_driver(&arxescsi_driver); -} - -static void __exit exit_arxe_scsi_driver(void) -{ - ecard_remove_driver(&arxescsi_driver); -} - -module_init(init_arxe_scsi_driver); -module_exit(exit_arxe_scsi_driver); +module_driver(arxescsi_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Stefan Hanske"); MODULE_DESCRIPTION("ARXESCSI driver for Acorn machines"); MODULE_LICENSE("GPL"); - diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index d1a2a22ffe8c..62c11168f321 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c @@ -324,18 +324,7 @@ static struct ecard_driver cumanascsi1_driver = { }, }; -static int __init cumanascsi_init(void) -{ - return ecard_register_driver(&cumanascsi1_driver); -} - -static void __exit cumanascsi_exit(void) -{ - ecard_remove_driver(&cumanascsi1_driver); -} - -module_init(cumanascsi_init); -module_exit(cumanascsi_exit); +module_driver(cumanascsi1_driver, ecard_register_driver, ecard_remove_driver); MODULE_DESCRIPTION("Cumana SCSI-1 driver for Acorn machines"); MODULE_LICENSE("GPL"); diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index e460068f6834..24945e1765ae 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c @@ -504,18 +504,7 @@ static struct ecard_driver cumanascsi2_driver = { }, }; -static int __init cumanascsi2_init(void) -{ - return ecard_register_driver(&cumanascsi2_driver); -} - -static void __exit cumanascsi2_exit(void) -{ - ecard_remove_driver(&cumanascsi2_driver); -} - -module_init(cumanascsi2_init); -module_exit(cumanascsi2_exit); +module_driver(cumanascsi2_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("Cumana SCSI-2 driver for Acorn machines"); diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index 99be9da8757f..823ad179f24c 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -626,18 +626,7 @@ static struct ecard_driver eesoxscsi_driver = { }, }; -static int __init eesox_init(void) -{ - return ecard_register_driver(&eesoxscsi_driver); -} - -static void __exit eesox_exit(void) -{ - ecard_remove_driver(&eesoxscsi_driver); -} - -module_init(eesox_init); -module_exit(eesox_exit); +module_driver(eesoxscsi_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("EESOX 'Fast' SCSI driver for Acorn machines"); diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index d69245007096..aea21bb13355 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c @@ -194,20 +194,8 @@ static struct ecard_driver oakscsi_driver = { }, }; -static int __init oakscsi_init(void) -{ - return ecard_register_driver(&oakscsi_driver); -} - -static void __exit oakscsi_exit(void) -{ - ecard_remove_driver(&oakscsi_driver); -} - -module_init(oakscsi_init); -module_exit(oakscsi_exit); +module_driver(oakscsi_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("Oak SCSI driver"); MODULE_LICENSE("GPL"); - diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 823c65ff6c12..67f071a0543b 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -432,18 +432,7 @@ static struct ecard_driver powertecscsi_driver = { }, }; -static int __init powertecscsi_init(void) -{ - return ecard_register_driver(&powertecscsi_driver); -} - -static void __exit powertecscsi_exit(void) -{ - ecard_remove_driver(&powertecscsi_driver); -} - -module_init(powertecscsi_init); -module_exit(powertecscsi_exit); +module_driver(powertecscsi_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("Powertec SCSI driver"); diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c index fb596262b9c7..f634de6e159f 100644 --- a/drivers/tty/serial/8250/8250_acorn.c +++ b/drivers/tty/serial/8250/8250_acorn.c @@ -120,19 +120,8 @@ static struct ecard_driver serial_card_driver = { }, }; -static int __init serial_card_init(void) -{ - return ecard_register_driver(&serial_card_driver); -} - -static void __exit serial_card_exit(void) -{ - ecard_remove_driver(&serial_card_driver); -} +module_driver(serial_card_driver, ecard_register_driver, ecard_remove_driver); MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("Acorn 8250-compatible serial port expansion card driver"); MODULE_LICENSE("GPL"); - -module_init(serial_card_init); -module_exit(serial_card_exit); -- 2.43.0