Commit 853e3f4c authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

skge: 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: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe17dc1e

drivers/net/ethernet/marvell/skge.c

+4 −4
Original line number Diff line number Diff line
@@ -3860,7 +3860,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, 
	return dev;

}



static void __devinit skge_show_addr(struct net_device *dev)

static void skge_show_addr(struct net_device *dev)

{

	const struct skge_port *skge = netdev_priv(dev);
@@ -3869,7 +3869,7 @@ static void __devinit skge_show_addr(struct net_device *dev) 


static int only_32bit_dma;



static int __devinit skge_probe(struct pci_dev *pdev,

static int skge_probe(struct pci_dev *pdev,

				const struct pci_device_id *ent)

{

	struct net_device *dev, *dev1;
@@ -4012,7 +4012,7 @@ static int __devinit skge_probe(struct pci_dev *pdev, 
	return err;

}



static void __devexit skge_remove(struct pci_dev *pdev)

static void skge_remove(struct pci_dev *pdev)

{

	struct skge_hw *hw  = pci_get_drvdata(pdev);

	struct net_device *dev0, *dev1;
@@ -4142,7 +4142,7 @@ static struct pci_driver skge_driver = { 
	.name =         DRV_NAME,

	.id_table =     skge_id_table,

	.probe =        skge_probe,

	.remove =       __devexit_p(skge_remove),

	.remove =       skge_remove,

	.shutdown =	skge_shutdown,

	.driver.pm =	SKGE_PM_OPS,

};

drivers/net/ethernet/marvell/sky2.c

+8 −8
Original line number Diff line number Diff line
@@ -3140,7 +3140,7 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk) 
}





static int __devinit sky2_init(struct sky2_hw *hw)

static int sky2_init(struct sky2_hw *hw)

{

	u8 t8;
@@ -4741,7 +4741,7 @@ static const struct net_device_ops sky2_netdev_ops[2] = { 
};



/* Initialize network device */

static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,

static struct net_device *sky2_init_netdev(struct sky2_hw *hw,

						     unsigned port,

						     int highmem, int wol)

{
@@ -4807,7 +4807,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, 
	return dev;

}



static void __devinit sky2_show_addr(struct net_device *dev)

static void sky2_show_addr(struct net_device *dev)

{

	const struct sky2_port *sky2 = netdev_priv(dev);
@@ -4815,7 +4815,7 @@ static void __devinit sky2_show_addr(struct net_device *dev) 
}



/* Handle software interrupt used during MSI test */

static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id)

static irqreturn_t sky2_test_intr(int irq, void *dev_id)

{

	struct sky2_hw *hw = dev_id;

	u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2);
@@ -4834,7 +4834,7 @@ static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id) 
}



/* Test interrupt path by forcing a a software IRQ */

static int __devinit sky2_test_msi(struct sky2_hw *hw)

static int sky2_test_msi(struct sky2_hw *hw)

{

	struct pci_dev *pdev = hw->pdev;

	int err;
@@ -4896,7 +4896,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz) 
	return buf;

}



static int __devinit sky2_probe(struct pci_dev *pdev,

static int sky2_probe(struct pci_dev *pdev,

				const struct pci_device_id *ent)

{

	struct net_device *dev, *dev1;
@@ -5086,7 +5086,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, 
	return err;

}



static void __devexit sky2_remove(struct pci_dev *pdev)

static void sky2_remove(struct pci_dev *pdev)

{

	struct sky2_hw *hw = pci_get_drvdata(pdev);

	int i;
@@ -5207,7 +5207,7 @@ static struct pci_driver sky2_driver = { 
	.name = DRV_NAME,

	.id_table = sky2_id_table,

	.probe = sky2_probe,

	.remove = __devexit_p(sky2_remove),

	.remove = sky2_remove,

	.shutdown = sky2_shutdown,

	.driver.pm = SKY2_PM_OPS,

};