iwlegacy: 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 <wfp5p@virginia.edu>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index e252acb9c86239aa0b031fad77d465beb4efb86d..d604b4036a764358e52bd2c2ca9d02bd24f14ce9 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3794,7 +3794,7 @@ out:
        return err;
 }
 
-static void __devexit
+static void
 il3945_pci_remove(struct pci_dev *pdev)
 {
        struct il_priv *il = pci_get_drvdata(pdev);
@@ -3884,7 +3884,7 @@ static struct pci_driver il3945_driver = {
        .name = DRV_NAME,
        .id_table = il3945_hw_card_ids,
        .probe = il3945_pci_probe,
-       .remove = __devexit_p(il3945_pci_remove),
+       .remove = il3945_pci_remove,
        .driver.pm = IL_LEGACY_PM_OPS,
 };
 

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 07ffa575e3efb7ccdf37baaddb43751f67b6bb88..c3fbf6717564a3295ea2a87ecdc669e80d2e9d89 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -6664,7 +6664,7 @@ out:
        return err;
 }
 
-static void __devexit
+static void
 il4965_pci_remove(struct pci_dev *pdev)
 {
        struct il_priv *il = pci_get_drvdata(pdev);
@@ -6772,7 +6772,7 @@ static struct pci_driver il4965_driver = {
        .name = DRV_NAME,
        .id_table = il4965_hw_card_ids,
        .probe = il4965_pci_probe,
-       .remove = __devexit_p(il4965_pci_remove),
+       .remove = il4965_pci_remove,
        .driver.pm = IL_LEGACY_PM_OPS,
 };