From 8cc085d604f7f2f1be68d0b50db1dfd5640266b7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:24:15 -0500 Subject: [PATCH] virtio_net: 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 Cc: Rusty Russell Cc: Michael S. Tsirkin Cc: virtualization@lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 26c502e4b871..90ac97df2d02 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1203,7 +1203,7 @@ static void remove_vq_common(struct virtnet_info *vi) __free_pages(get_a_page(vi, GFP_KERNEL), 0); } -static void __devexit virtnet_remove(struct virtio_device *vdev) +static void virtnet_remove(struct virtio_device *vdev) { struct virtnet_info *vi = vdev->priv; @@ -1293,7 +1293,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, -- 2.30.2