openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: cris: make eth_v10.c explicitly non-modular 

The Makefile/Kconfig currently controlling compilation of this code is:

drivers/net/cris/Makefile:obj-$(CONFIG_ETRAX_ARCH_V10) += eth_v10.o

arch/cris/Kconfig:config ETRAX_ARCH_V10
arch/cris/Kconfig:       bool

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure use, 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.

There was a one line wrapper for the int init function, which made no
sense; hence we just put the device_initcall on the true init function
itself and delete the pointless wrapper.  In doing that we get rid of
the following compile warning:

   WARNING: drivers/net/built-in.o(.text+0x1e28): Section mismatch in
   reference from the function etrax_init_module() to the function
   .init.text:etrax_ethernet_init()

We don't replace module.h with init.h since the file already has that.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: netdev@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Gortmaker 2016-10-31 15:32:16 -04:00 committed by David S. Miller
parent 17a032b7bf
commit a13925a46e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/cris/eth_v10.c
View File

@ -7,9 +7,6 @@
* *
*/ */
#include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/types.h> #include <linux/types.h>
@ -411,6 +408,7 @@ etrax_ethernet_init(void)
led_next_time = jiffies; led_next_time = jiffies;
return 0; return 0;
} }
device_initcall(etrax_ethernet_init)
/* set MAC address of the interface. called from the core after a /* set MAC address of the interface. called from the core after a
* SIOCSIFADDR ioctl, and from the bootup above. * SIOCSIFADDR ioctl, and from the bootup above.
@ -1714,11 +1712,6 @@ e100_netpoll(struct net_device* netdev)
} }
#endif #endif
static int
etrax_init_module(void)
{
return etrax_ethernet_init();
}
static int __init static int __init
e100_boot_setup(char* str) e100_boot_setup(char* str)
@ -1741,5 +1734,3 @@ e100_boot_setup(char* str)
} }
__setup("etrax100_eth=", e100_boot_setup); __setup("etrax100_eth=", e100_boot_setup);
module_init(etrax_init_module);