Skip to content
  • Paul Gortmaker's avatar
    net: cris: make eth_v10.c explicitly non-modular · a13925a4
    Paul Gortmaker authored
    
    
    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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    a13925a4