netdev - [PATCH net-next 3/6] e100: remove the boilerplate of e100 module for init/exit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1409650616-1035-4-git-send-email-sakiwit@gmail.com>
Date:	Tue,  2 Sep 2014 03:36:53 -0600
From:	Jean Sacren <sakiwit@...il.com>
To:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
Cc:	linux.nics@...el.com, e1000-devel@...ts.sourceforge.net,
	netdev@...r.kernel.org
Subject: [PATCH net-next 3/6] e100: remove the boilerplate of e100 module for init/exit

Use module_pci_driver() to simplify e100 driver module init/exit
routine.

After the change, the basic driver info doesn't print unless the
pertinent hardware is present. Printing such info generally
pronounces the presence of the hardware and it should be part of the
probe routine. Blindly printing not only clutters the console, but
also incurs unnecessary confusion.

Signed-off-by: Jean Sacren <sakiwit@...il.com>
---
 drivers/net/ethernet/intel/e100.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 781065eb5431..8b95129fcf91 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2846,6 +2846,11 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct nic *nic;
 	int err;
 
+	if (((1 << debug) - 1) & NETIF_MSG_DRV) {
+		pr_info_once("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+		pr_info_once("%s\n", DRV_COPYRIGHT);
+	}
+
 	if (!(netdev = alloc_etherdev(sizeof(struct nic))))
 		return -ENOMEM;
 
@@ -3184,19 +3189,4 @@ static struct pci_driver e100_driver = {
 	.err_handler = &e100_err_handler,
 };
 
-static int __init e100_init_module(void)
-{
-	if (((1 << debug) - 1) & NETIF_MSG_DRV) {
-		pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
-		pr_info("%s\n", DRV_COPYRIGHT);
-	}
-	return pci_register_driver(&e100_driver);
-}
-
-static void __exit e100_cleanup_module(void)
-{
-	pci_unregister_driver(&e100_driver);
-}
-
-module_init(e100_init_module);
-module_exit(e100_cleanup_module);
+module_pci_driver(e100_driver);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html