[Xen-devel] [PATCH 086/493] net: remove use of __devexit_p

[Bill Pemberton <wfp5p@xxxxxxxxxxxx>]

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> 
Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxx> 
Cc: Shreyas Bhatewara <sbhatewara@xxxxxxxxxx> 
Cc: "VMware, Inc." <pv-drivers@xxxxxxxxxx> 
Cc: Francois Romieu <romieu@xxxxxxxxxxxxx> 
Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx 
Cc: netdev@xxxxxxxxxxxxxxx 
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx 
---
 drivers/net/virtio_net.c          | 2 +-
 drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
 drivers/net/wan/dscc4.c           | 2 +-
 drivers/net/wan/farsync.c         | 2 +-
 drivers/net/wan/lmc/lmc_main.c    | 2 +-
 drivers/net/xen-netfront.c        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 97f4ff8..b0c1630 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1285,7 +1285,7 @@ static struct virtio_driver virtio_net_driver = {
        .driver.owner = THIS_MODULE,
        .id_table =     id_table,
        .probe =        virtnet_probe,
-       .remove =       __devexit_p(virtnet_remove),
+       .remove =       virtnet_remove,
        .config_changed = virtnet_config_changed,
 #ifdef CONFIG_PM
        .freeze =       virtnet_freeze,
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c 
b/drivers/net/vmxnet3/vmxnet3_drv.c
index 7e9622f..aa1bde8 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3302,7 +3302,7 @@ static struct pci_driver vmxnet3_driver = {
        .name           = vmxnet3_driver_name,
        .id_table       = vmxnet3_pciid_table,
        .probe          = vmxnet3_probe_device,
-       .remove         = __devexit_p(vmxnet3_remove_device),
+       .remove         = vmxnet3_remove_device,
 #ifdef CONFIG_PM
        .driver.pm      = &vmxnet3_pm_ops,
 #endif
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index ef36caf..2eddbbf 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -2053,7 +2053,7 @@ static struct pci_driver dscc4_driver = {
        .name           = DRV_NAME,
        .id_table       = dscc4_pci_tbl,
        .probe          = dscc4_init_one,
-       .remove         = __devexit_p(dscc4_remove_one),
+       .remove         = dscc4_remove_one,
 };
 
 module_pci_driver(dscc4_driver);
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index b627132..0397544 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2652,7 +2652,7 @@ static struct pci_driver fst_driver = {
         .name          = FST_NAME,
         .id_table      = fst_pci_dev_id,
         .probe         = fst_add_one,
-        .remove        = __devexit_p(fst_remove_one),
+       .remove         = fst_remove_one,
         .suspend       = NULL,
         .resume        = NULL,
 };
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index f5d533a..358e25f 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1733,7 +1733,7 @@ static struct pci_driver lmc_driver = {
        .name           = "lmc",
        .id_table       = lmc_pci_tbl,
        .probe          = lmc_init_one,
-       .remove         = __devexit_p(lmc_remove_one),
+       .remove         = lmc_remove_one,
 };
 
 module_pci_driver(lmc_driver);
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index caa0110..3c3b93e 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1934,7 +1934,7 @@ static int __devexit xennet_remove(struct xenbus_device 
*dev)
 
 static DEFINE_XENBUS_DRIVER(netfront, ,
        .probe = netfront_probe,
-       .remove = __devexit_p(xennet_remove),
+       .remove = xennet_remove,
        .resume = netfront_resume,
        .otherend_changed = netback_changed,
 );
-- 
1.8.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel