Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8590dbc7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6dfb6715

drivers/virtio/virtio_balloon.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -500,7 +500,7 @@ static void remove_common(struct virtio_balloon *vb) 
	vb->vdev->config->del_vqs(vb->vdev);

	vb->vdev->config->del_vqs(vb->vdev);

}

}





static void __devexit virtballoon_remove(struct virtio_device *vdev)

static void virtballoon_remove(struct virtio_device *vdev)

{

{

	struct virtio_balloon *vb = vdev->priv;

	struct virtio_balloon *vb = vdev->priv;
@@ -552,7 +552,7 @@ static struct virtio_driver virtio_balloon_driver = { 
	.driver.owner =	THIS_MODULE,

	.driver.owner =	THIS_MODULE,

	.id_table =	id_table,

	.id_table =	id_table,

	.probe =	virtballoon_probe,

	.probe =	virtballoon_probe,

	.remove =	__devexit_p(virtballoon_remove),

	.remove =	virtballoon_remove,

	.config_changed = virtballoon_changed,

	.config_changed = virtballoon_changed,

#ifdef CONFIG_PM

#ifdef CONFIG_PM

	.freeze	=	virtballoon_freeze,

	.freeze	=	virtballoon_freeze,

drivers/virtio/virtio_mmio.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -440,7 +440,7 @@ static struct virtio_config_ops virtio_mmio_config_ops = { 




/* Platform device */

/* Platform device */





static int __devinit virtio_mmio_probe(struct platform_device *pdev)

static int virtio_mmio_probe(struct platform_device *pdev)

{

{

	struct virtio_mmio_device *vm_dev;

	struct virtio_mmio_device *vm_dev;

	struct resource *mem;

	struct resource *mem;
@@ -493,7 +493,7 @@ static int __devinit virtio_mmio_probe(struct platform_device *pdev) 
	return register_virtio_device(&vm_dev->vdev);

	return register_virtio_device(&vm_dev->vdev);

}

}





static int __devexit virtio_mmio_remove(struct platform_device *pdev)

static int virtio_mmio_remove(struct platform_device *pdev)

{

{

	struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev);

	struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev);
@@ -638,7 +638,7 @@ MODULE_DEVICE_TABLE(of, virtio_mmio_match); 




static struct platform_driver virtio_mmio_driver = {

static struct platform_driver virtio_mmio_driver = {

	.probe		= virtio_mmio_probe,

	.probe		= virtio_mmio_probe,

	.remove		= __devexit_p(virtio_mmio_remove),

	.remove		= virtio_mmio_remove,

	.driver		= {

	.driver		= {

		.name	= "virtio-mmio",

		.name	= "virtio-mmio",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

drivers/virtio/virtio_pci.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -676,7 +676,7 @@ static void virtio_pci_release_dev(struct device *_d) 
}

}





/* the PCI probing function */

/* the PCI probing function */

static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,

static int virtio_pci_probe(struct pci_dev *pci_dev,

			    const struct pci_device_id *id)

			    const struct pci_device_id *id)

{

{

	struct virtio_pci_device *vp_dev;

	struct virtio_pci_device *vp_dev;
@@ -751,7 +751,7 @@ out: 
	return err;

	return err;

}

}





static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)

static void virtio_pci_remove(struct pci_dev *pci_dev)

{

{

	struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);

	struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
@@ -822,7 +822,7 @@ static struct pci_driver virtio_pci_driver = { 
	.name		= "virtio-pci",

	.name		= "virtio-pci",

	.id_table	= virtio_pci_id_table,

	.id_table	= virtio_pci_id_table,

	.probe		= virtio_pci_probe,

	.probe		= virtio_pci_probe,

	.remove		= __devexit_p(virtio_pci_remove),

	.remove		= virtio_pci_remove,

#ifdef CONFIG_PM

#ifdef CONFIG_PM

	.driver.pm	= &virtio_pci_pm_ops,

	.driver.pm	= &virtio_pci_pm_ops,

#endif

#endif