From: Bill Pemberton Date: Mon, 3 Dec 2012 14:23:53 +0000 (-0500) Subject: jme: remove __dev* attributes X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=af37557b1b222c64e005c105c81aa3888128bb5d;p=~shefty%2Frdma-dev.git jme: 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: Bill Pemberton Cc: Guo-Fu Tseng Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 60ac46f4ac0..0519afa413d 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -2965,7 +2965,7 @@ static const struct net_device_ops jme_netdev_ops = { #endif }; -static int __devinit +static int jme_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -3203,7 +3203,7 @@ err_out: return rc; } -static void __devexit +static void jme_remove_one(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); @@ -3318,7 +3318,7 @@ static struct pci_driver jme_driver = { .name = DRV_NAME, .id_table = jme_pci_tbl, .probe = jme_init_one, - .remove = __devexit_p(jme_remove_one), + .remove = jme_remove_one, .shutdown = jme_shutdown, .driver.pm = JME_PM_OPS, };