Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f9a12f8 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

net/intel: remove __dev* attributes 



CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: Tushar Dave <tushar.n.dave@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0329aba1

drivers/net/ethernet/intel/e100.c

+3 −3
Original line number Diff line number Diff line
@@ -2829,7 +2829,7 @@ static const struct net_device_ops e100_netdev_ops = { 
	.ndo_set_features	= e100_set_features,

};



static int __devinit e100_probe(struct pci_dev *pdev,

static int e100_probe(struct pci_dev *pdev,

	const struct pci_device_id *ent)

{

	struct net_device *netdev;
@@ -2981,7 +2981,7 @@ err_out_free_dev: 
	return err;

}



static void __devexit e100_remove(struct pci_dev *pdev)

static void e100_remove(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -3167,7 +3167,7 @@ static struct pci_driver e100_driver = { 
	.name =         DRV_NAME,

	.id_table =     e100_id_table,

	.probe =        e100_probe,

	.remove =       __devexit_p(e100_remove),

	.remove =       e100_remove,

#ifdef CONFIG_PM

	/* Power Management hooks */

	.suspend =      e100_suspend,

drivers/net/ethernet/intel/e1000/e1000_main.c

+6 −6
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void e1000_update_stats(struct e1000_adapter *adapter); 
static int e1000_init_module(void);

static void e1000_exit_module(void);

static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

static void __devexit e1000_remove(struct pci_dev *pdev);

static void e1000_remove(struct pci_dev *pdev);

static int e1000_alloc_queues(struct e1000_adapter *adapter);

static int e1000_sw_init(struct e1000_adapter *adapter);

static int e1000_open(struct net_device *netdev);
@@ -202,7 +202,7 @@ static struct pci_driver e1000_driver = { 
	.name     = e1000_driver_name,

	.id_table = e1000_pci_tbl,

	.probe    = e1000_probe,

	.remove   = __devexit_p(e1000_remove),

	.remove   = e1000_remove,

#ifdef CONFIG_PM

	/* Power Management Hooks */

	.suspend  = e1000_suspend,
@@ -938,7 +938,7 @@ static int e1000_init_hw_struct(struct e1000_adapter *adapter, 
 * The OS initialization, configuring of the adapter private structure,

 * and a hardware reset occur.

 **/

static int __devinit e1000_probe(struct pci_dev *pdev,

static int e1000_probe(struct pci_dev *pdev,

				 const struct pci_device_id *ent)

{

	struct net_device *netdev;
@@ -1273,7 +1273,7 @@ err_pci_reg: 
 * memory.

 **/



static void __devexit e1000_remove(struct pci_dev *pdev)

static void e1000_remove(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1309,7 +1309,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 
 * e1000_init_hw_struct MUST be called before this function

 **/



static int __devinit e1000_sw_init(struct e1000_adapter *adapter)

static int e1000_sw_init(struct e1000_adapter *adapter)

{

	adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
@@ -1340,7 +1340,7 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 
 * number of queues at compile-time.

 **/



static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)

static int e1000_alloc_queues(struct e1000_adapter *adapter)

{

	adapter->tx_ring = kcalloc(adapter->num_tx_queues,

	                           sizeof(struct e1000_tx_ring), GFP_KERNEL);

drivers/net/ethernet/intel/e1000/e1000_param.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }

#define E1000_PARAM(X, desc) \

	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \

	static int X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \

	static unsigned int num_##X; \

	module_param_array_named(X, X, int, &num_##X, 0); \

	MODULE_PARM_DESC(X, desc);
@@ -205,7 +205,7 @@ struct e1000_option { 
	} arg;

};



static int __devinit e1000_validate_option(unsigned int *value,

static int e1000_validate_option(unsigned int *value,

					   const struct e1000_option *opt,

					   struct e1000_adapter *adapter)

{
@@ -268,7 +268,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter); 
 * in a variable in the adapter structure.

 **/



void __devinit e1000_check_options(struct e1000_adapter *adapter)

void e1000_check_options(struct e1000_adapter *adapter)

{

	struct e1000_option opt;

	int bd = adapter->bd_number;
@@ -534,7 +534,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) 
 * Handles speed and duplex options on fiber adapters

 **/



static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)

static void e1000_check_fiber_options(struct e1000_adapter *adapter)

{

	int bd = adapter->bd_number;

	if (num_Speed > bd) {
@@ -560,7 +560,7 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) 
 * Handles speed and duplex options on copper adapters

 **/



static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)

static void e1000_check_copper_options(struct e1000_adapter *adapter)

{

	struct e1000_option opt;

	unsigned int speed, dplx, an;

drivers/net/ethernet/intel/e1000e/netdev.c

+5 −5
Original line number Diff line number Diff line
@@ -2503,7 +2503,7 @@ void e1000e_write_itr(struct e1000_adapter *adapter, u32 itr) 
 * e1000_alloc_queues - Allocate memory for all rings

 * @adapter: board private structure to initialize

 **/

static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)

static int e1000_alloc_queues(struct e1000_adapter *adapter)

{

	int size = sizeof(struct e1000_ring);
@@ -3676,7 +3676,7 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter) 
 * Fields are initialized based on PCI device information and

 * OS network device settings (MTU size).

 **/

static int __devinit e1000_sw_init(struct e1000_adapter *adapter)

static int e1000_sw_init(struct e1000_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;
@@ -6024,7 +6024,7 @@ static const struct net_device_ops e1000e_netdev_ops = { 
 * The OS initialization, configuring of the adapter private structure,

 * and a hardware reset occur.

 **/

static int __devinit e1000_probe(struct pci_dev *pdev,

static int e1000_probe(struct pci_dev *pdev,

				 const struct pci_device_id *ent)

{

	struct net_device *netdev;
@@ -6361,7 +6361,7 @@ err_dma: 
 * Hot-Plug event, or because the driver is going to be removed from

 * memory.

 **/

static void __devexit e1000_remove(struct pci_dev *pdev)

static void e1000_remove(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6512,7 +6512,7 @@ static struct pci_driver e1000_driver = { 
	.name     = e1000e_driver_name,

	.id_table = e1000_pci_tbl,

	.probe    = e1000_probe,

	.remove   = __devexit_p(e1000_remove),

	.remove   = e1000_remove,

#ifdef CONFIG_PM

	.driver   = {

		.pm = &e1000_pm_ops,

drivers/net/ethernet/intel/e1000e/param.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(copybreak, 
 */

#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }

#define E1000_PARAM(X, desc)					\

	static int __devinitdata X[E1000_MAX_NIC+1]		\

	static int X[E1000_MAX_NIC+1]		\

		= E1000_PARAM_INIT;				\

	static unsigned int num_##X;				\

	module_param_array_named(X, X, int, &num_##X, 0);	\
@@ -172,7 +172,7 @@ struct e1000_option { 
	} arg;

};



static int __devinit e1000_validate_option(unsigned int *value,

static int e1000_validate_option(unsigned int *value,

					   const struct e1000_option *opt,

					   struct e1000_adapter *adapter)

{
@@ -235,7 +235,7 @@ static int __devinit e1000_validate_option(unsigned int *value, 
 * value exists, a default value is used.  The final value is stored

 * in a variable in the adapter structure.

 **/

void __devinit e1000e_check_options(struct e1000_adapter *adapter)

void e1000e_check_options(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;

	int bd = adapter->bd_number;