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

Commit eb9248ee authored by Bill Pemberton's avatar Bill Pemberton Committed by John W. Linville
Browse files

ipw2x00: 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: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fcff0c08

drivers/net/wireless/ipw2x00/ipw2100.c

+2 −2
Original line number Diff line number Diff line
@@ -6410,7 +6410,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, 
	goto out;

}



static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)

static void ipw2100_pci_remove_one(struct pci_dev *pci_dev)

{

	struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);

	struct net_device *dev = priv->net_dev;
@@ -6606,7 +6606,7 @@ static struct pci_driver ipw2100_pci_driver = { 
	.name = DRV_NAME,

	.id_table = ipw2100_pci_id_table,

	.probe = ipw2100_pci_init_one,

	.remove = __devexit_p(ipw2100_pci_remove_one),

	.remove = ipw2100_pci_remove_one,

#ifdef CONFIG_PM

	.suspend = ipw2100_suspend,

	.resume = ipw2100_resume,

drivers/net/wireless/ipw2x00/ipw2200.c

+4 −4
Original line number Diff line number Diff line
@@ -10772,7 +10772,7 @@ static void ipw_bg_link_down(struct work_struct *work) 
	mutex_unlock(&priv->mutex);

}



static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv)

static int ipw_setup_deferred_work(struct ipw_priv *priv)

{

	int ret = 0;
@@ -11726,7 +11726,7 @@ static const struct net_device_ops ipw_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

};



static int __devinit ipw_pci_probe(struct pci_dev *pdev,

static int ipw_pci_probe(struct pci_dev *pdev,

				   const struct pci_device_id *ent)

{

	int err = 0;
@@ -11899,7 +11899,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, 
	return err;

}



static void __devexit ipw_pci_remove(struct pci_dev *pdev)

static void ipw_pci_remove(struct pci_dev *pdev)

{

	struct ipw_priv *priv = pci_get_drvdata(pdev);

	struct list_head *p, *q;
@@ -12061,7 +12061,7 @@ static struct pci_driver ipw_driver = { 
	.name = DRV_NAME,

	.id_table = card_ids,

	.probe = ipw_pci_probe,

	.remove = __devexit_p(ipw_pci_remove),

	.remove = ipw_pci_remove,

#ifdef CONFIG_PM

	.suspend = ipw_pci_suspend,

	.resume = ipw_pci_resume,