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

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

net/sgi: 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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03c4d832

drivers/net/ethernet/sgi/ioc3-eth.c

+5 −5
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static int ioc3_is_menet(struct pci_dev *pdev) 
 * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been

 * registered.

 */

static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)

static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart)

{

#define COSMISC_CONSTANT 6
@@ -1169,7 +1169,7 @@ static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart) 
	serial8250_register_8250_port(&port);

}



static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)

static void ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)

{

	/*

	 * We need to recognice and treat the fourth MENET serial as it
@@ -1229,7 +1229,7 @@ static const struct net_device_ops ioc3_netdev_ops = { 
	.ndo_change_mtu		= eth_change_mtu,

};



static int __devinit ioc3_probe(struct pci_dev *pdev,

static int ioc3_probe(struct pci_dev *pdev,

	const struct pci_device_id *ent)

{

	unsigned int sw_physid1, sw_physid2;
@@ -1368,7 +1368,7 @@ static int __devinit ioc3_probe(struct pci_dev *pdev, 
	return err;

}



static void __devexit ioc3_remove_one (struct pci_dev *pdev)

static void ioc3_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct ioc3_private *ip = netdev_priv(dev);
@@ -1396,7 +1396,7 @@ static struct pci_driver ioc3_driver = { 
	.name		= "ioc3-eth",

	.id_table	= ioc3_pci_tbl,

	.probe		= ioc3_probe,

	.remove		= __devexit_p(ioc3_remove_one),

	.remove		= ioc3_remove_one,

};



static int __init ioc3_init_module(void)

drivers/net/ethernet/sgi/meth.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static const struct net_device_ops meth_netdev_ops = { 
/*

 * The init function.

 */

static int __devinit meth_probe(struct platform_device *pdev)

static int meth_probe(struct platform_device *pdev)

{

	struct net_device *dev;

	struct meth_private *priv;