From 04bfffb8053c7206c3b63c25c0775b6ad7053270 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:56:27 -0500 Subject: wireless: 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: John W. Linville --- drivers/net/wireless/adm8211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/net/wireless/adm8211.c') diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 154a4965be4f..3d339e04efb7 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c @@ -1761,7 +1761,7 @@ static const struct ieee80211_ops adm8211_ops = { .get_tsf = adm8211_get_tsft }; -static int __devinit adm8211_probe(struct pci_dev *pdev, +static int adm8211_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct ieee80211_hw *dev; @@ -1935,7 +1935,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, } -static void __devexit adm8211_remove(struct pci_dev *pdev) +static void adm8211_remove(struct pci_dev *pdev) { struct ieee80211_hw *dev = pci_get_drvdata(pdev); struct adm8211_priv *priv; @@ -1985,7 +1985,7 @@ static struct pci_driver adm8211_driver = { .name = "adm8211", .id_table = adm8211_pci_id_table, .probe = adm8211_probe, - .remove = __devexit_p(adm8211_remove), + .remove = adm8211_remove, #ifdef CONFIG_PM .suspend = adm8211_suspend, .resume = adm8211_resume, -- cgit v1.2.3