Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next

Networking:  Remove __dev* markings from the networking drivers

This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.

Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.

Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index 2fb01bf1815..1d342d37915 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -23,7 +23,7 @@
 #define dr16(reg)       ioread16(ioaddr + (reg))
 #define dr8(reg)        ioread8(ioaddr + (reg))
 
-static char version[] __devinitdata =
+static char version[] =
       KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";
 #define MAX_UNITS 8
 static int mtu[MAX_UNITS];
@@ -110,7 +110,7 @@ static const struct net_device_ops netdev_ops = {
         .ndo_change_mtu         = change_mtu,
 };
 
-static int __devinit
+static int
 rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct net_device *dev;
@@ -1727,7 +1727,7 @@ rio_close (struct net_device *dev)
         return 0;
 }
 
-static void __devexit
+static void
 rio_remove1 (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
@@ -1755,7 +1755,7 @@ static struct pci_driver rio_driver = {
         .name           = "dl2k",
         .id_table       = rio_pci_tbl,
         .probe          = rio_probe1,
-        .remove         = __devexit_p(rio_remove1),
+        .remove         = rio_remove1,
 };
 
 module_pci_driver(rio_driver);
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index bbeb4c7a85b..28fc11b2f1e 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -102,7 +102,7 @@ static char *media[MAX_UNITS];
 #include <linux/mii.h>
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __devinitconst =
+static const char version[] =
         KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
         " Written by Donald Becker\n";
 
@@ -218,7 +218,7 @@ enum {
 struct pci_id_info {
         const char *name;
 };
-static const struct pci_id_info pci_id_tbl[] __devinitconst = {
+static const struct pci_id_info pci_id_tbl[] = {
         {"D-Link DFE-550TX FAST Ethernet Adapter"},
         {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
         {"D-Link DFE-580TX 4 port Server Adapter"},
@@ -482,8 +482,8 @@ static const struct net_device_ops netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
-static int __devinit sundance_probe1 (struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
+static int sundance_probe1(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
 {
         struct net_device *dev;
         struct netdev_private *np;
@@ -711,7 +711,7 @@ static int change_mtu(struct net_device *dev, int new_mtu)
 
 #define eeprom_delay(ee_addr)   ioread32(ee_addr)
 /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces. */
-static int __devinit eeprom_read(void __iomem *ioaddr, int location)
+static int eeprom_read(void __iomem *ioaddr, int location)
 {
         int boguscnt = 10000;           /* Typical 1900 ticks. */
         iowrite16(0x0200 | (location & 0xff), ioaddr + EECtrl);
@@ -1914,7 +1914,7 @@ static int netdev_close(struct net_device *dev)
         return 0;
 }
 
-static void __devexit sundance_remove1 (struct pci_dev *pdev)
+static void sundance_remove1(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -1989,7 +1989,7 @@ static struct pci_driver sundance_driver = {
         .name           = DRV_NAME,
         .id_table       = sundance_pci_tbl,
         .probe          = sundance_probe1,
-        .remove         = __devexit_p(sundance_remove1),
+        .remove         = sundance_remove1,
 #ifdef CONFIG_PM
         .suspend        = sundance_suspend,
         .resume         = sundance_resume,