Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Drivers: virtio: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+9 -9
+2 -2
drivers/virtio/virtio_balloon.c
··· 500 500 vb->vdev->config->del_vqs(vb->vdev); 501 501 } 502 502 503 - static void __devexit virtballoon_remove(struct virtio_device *vdev) 503 + static void virtballoon_remove(struct virtio_device *vdev) 504 504 { 505 505 struct virtio_balloon *vb = vdev->priv; 506 506 ··· 552 552 .driver.owner = THIS_MODULE, 553 553 .id_table = id_table, 554 554 .probe = virtballoon_probe, 555 - .remove = __devexit_p(virtballoon_remove), 555 + .remove = virtballoon_remove, 556 556 .config_changed = virtballoon_changed, 557 557 #ifdef CONFIG_PM 558 558 .freeze = virtballoon_freeze,
+3 -3
drivers/virtio/virtio_mmio.c
··· 440 440 441 441 /* Platform device */ 442 442 443 - static int __devinit virtio_mmio_probe(struct platform_device *pdev) 443 + static int virtio_mmio_probe(struct platform_device *pdev) 444 444 { 445 445 struct virtio_mmio_device *vm_dev; 446 446 struct resource *mem; ··· 493 493 return register_virtio_device(&vm_dev->vdev); 494 494 } 495 495 496 - static int __devexit virtio_mmio_remove(struct platform_device *pdev) 496 + static int virtio_mmio_remove(struct platform_device *pdev) 497 497 { 498 498 struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev); 499 499 ··· 638 638 639 639 static struct platform_driver virtio_mmio_driver = { 640 640 .probe = virtio_mmio_probe, 641 - .remove = __devexit_p(virtio_mmio_remove), 641 + .remove = virtio_mmio_remove, 642 642 .driver = { 643 643 .name = "virtio-mmio", 644 644 .owner = THIS_MODULE,
+4 -4
drivers/virtio/virtio_pci.c
··· 676 676 } 677 677 678 678 /* the PCI probing function */ 679 - static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, 680 - const struct pci_device_id *id) 679 + static int virtio_pci_probe(struct pci_dev *pci_dev, 680 + const struct pci_device_id *id) 681 681 { 682 682 struct virtio_pci_device *vp_dev; 683 683 int err; ··· 751 751 return err; 752 752 } 753 753 754 - static void __devexit virtio_pci_remove(struct pci_dev *pci_dev) 754 + static void virtio_pci_remove(struct pci_dev *pci_dev) 755 755 { 756 756 struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); 757 757 ··· 822 822 .name = "virtio-pci", 823 823 .id_table = virtio_pci_id_table, 824 824 .probe = virtio_pci_probe, 825 - .remove = __devexit_p(virtio_pci_remove), 825 + .remove = virtio_pci_remove, 826 826 #ifdef CONFIG_PM 827 827 .driver.pm = &virtio_pci_pm_ops, 828 828 #endif