netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <netdev@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	"David S. Miller" <davem@davemloft.net>,
	<linux-m68k@vger.kernel.org>
Subject: [PATCH 4/6] net/ethernet: make amd/hplance.c driver explicitly non-modular
Date: Mon, 28 Sep 2015 15:51:28 -0400	[thread overview]
Message-ID: <1443469890-19485-5-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1443469890-19485-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig for this driver is currently:

config HPLANCE
        bool "HP on-board LANCE support"

...meaning that it currently is not being built as a module by
anyone.  Lets remove the modular and unused code here, so that
when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

We don't swap module.h for init.h since this file has init.h already.

We move the information from the MODULE_LICENSE tag to the top of the
file in this case, since it is not duplicating similar information
already there.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/net/ethernet/amd/hplance.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c
index 6c9de117ffc6..fa9397508a79 100644
--- a/drivers/net/ethernet/amd/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c
@@ -3,9 +3,9 @@
  * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk>
  * Based on the Sun Lance driver and the NetBSD HP Lance driver
  * Uses the generic 7990.c LANCE code.
+ * License: GPL
  */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
@@ -220,13 +220,4 @@ static int __init hplance_init_module(void)
 {
 	return dio_register_driver(&hplance_driver);
 }
-
-static void __exit hplance_cleanup_module(void)
-{
-	dio_unregister_driver(&hplance_driver);
-}
-
-module_init(hplance_init_module);
-module_exit(hplance_cleanup_module);
-
-MODULE_LICENSE("GPL");
+device_initcall(hplance_init_module);
-- 
2.6.0.rc3

  parent reply	other threads:[~2015-09-28 19:51 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-28 19:51 [PATCH net-next 0/6] make non-modular code explicitly non-modular Paul Gortmaker
2015-09-28 19:51 ` [PATCH 1/6] net/core: make sock_diag.c " Paul Gortmaker
2015-09-28 19:51 ` [PATCH 2/6] net/dcb: make dcbnl.c " Paul Gortmaker
2015-09-28 19:51 ` [PATCH 3/6] net/sched: make sch_blackhole.c " Paul Gortmaker
2015-09-28 19:51 ` Paul Gortmaker [this message]
2015-09-28 19:51 ` [PATCH 5/6] net/ethernet: make 8390/mac8390.c driver " Paul Gortmaker
2015-09-28 19:51 ` [PATCH 6/6] net/ethernet: make apple/macmace.c " Paul Gortmaker
2015-09-28 21:09 ` [PATCH net-next 0/6] make non-modular code " Geert Uytterhoeven
2015-09-28 21:32   ` Paul Gortmaker
2015-09-29  6:32     ` Finn Thain
2015-09-29 13:33       ` Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443469890-19485-5-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=davem@davemloft.net \
    --cc=linux-m68k@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).