virtio: do not statically allocate root device

We shouldn't be statically allocating the root device object,
so dynamically allocate it using root_device_register()
instead.

Also avoids this warning from 'rmmod virtio_pci':

  Device 'virtio-pci' does not have a release() function, it is broken and must be fixed

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 265fdf2d127..bef6b45e8a5 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -73,10 +73,7 @@ MODULE_DEVICE_TABLE(pci, virtio_pci_id_table);
 /* A PCI device has it's own struct device and so does a virtio device so
  * we create a place for the virtio devices to show up in sysfs.  I think it
  * would make more sense for virtio to not insist on having it's own device. */
-static struct device virtio_pci_root = {
-        .parent         = NULL,
-        .init_name      = "virtio-pci",
-};
+static struct device *virtio_pci_root;
 
 /* Convert a generic virtio device to our structure */
 static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev)
@@ -343,7 +340,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
         if (vp_dev == NULL)
                 return -ENOMEM;
 
-        vp_dev->vdev.dev.parent = &virtio_pci_root;
+        vp_dev->vdev.dev.parent = virtio_pci_root;
         vp_dev->vdev.dev.release = virtio_pci_release_dev;
         vp_dev->vdev.config = &virtio_pci_config_ops;
         vp_dev->pci_dev = pci_dev;
@@ -437,13 +434,13 @@ static int __init virtio_pci_init(void)
 {
         int err;
 
-        err = device_register(&virtio_pci_root);
-        if (err)
-                return err;
+        virtio_pci_root = root_device_register("virtio-pci");
+        if (IS_ERR(virtio_pci_root))
+                return PTR_ERR(virtio_pci_root);
 
         err = pci_register_driver(&virtio_pci_driver);
         if (err)
-                device_unregister(&virtio_pci_root);
+                device_unregister(virtio_pci_root);
 
         return err;
 }
@@ -452,8 +449,8 @@ module_init(virtio_pci_init);
 
 static void __exit virtio_pci_exit(void)
 {
-        device_unregister(&virtio_pci_root);
         pci_unregister_driver(&virtio_pci_driver);
+        root_device_unregister(virtio_pci_root);
 }
 
 module_exit(virtio_pci_exit);