enic: 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 <[email protected]>
Cc: Christian Benvenuti <[email protected]>
Cc: Roopa Prabhu <[email protected]>
Cc: Neel Patel <[email protected]>
Cc: Nishank Trivedi <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index ad1468b3ab914442575f3fce1e35754da3221789..930f03bd1263e675f063ff0b1206c5f073075182 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2275,7 +2275,7 @@ static void enic_iounmap(struct enic *enic)
                        iounmap(enic->bar[i].vaddr);
 }
 
-static int __devinit enic_probe(struct pci_dev *pdev,
+static int enic_probe(struct pci_dev *pdev,
        const struct pci_device_id *ent)
 {
        struct device *dev = &pdev->dev;
@@ -2552,7 +2552,7 @@ err_out_free_netdev:
        return err;
 }
 
-static void __devexit enic_remove(struct pci_dev *pdev)
+static void enic_remove(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
 
@@ -2584,7 +2584,7 @@ static struct pci_driver enic_driver = {
        .name = DRV_NAME,
        .id_table = enic_id_table,
        .probe = enic_probe,
-       .remove = __devexit_p(enic_remove),
+       .remove = enic_remove,
 };
 
 static int __init enic_init_module(void)