xen/scsi[front|back]: consolidate and simplify struct xenbus_driver instantiation

With " Xen: consolidate and simplify struct xenbus_driver instantiation"
the init structure is different.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/scsi/xen-scsiback/xenbus.c b/drivers/scsi/xen-scsiback/xenbus.c
index 0816c0e41b28e6e0098b8cdf875c87e29a5ec1b4..2869f892a21272b10fe2c33fdbb3168d2fcd24f4 100644 (file)
--- a/drivers/scsi/xen-scsiback/xenbus.c
+++ b/drivers/scsi/xen-scsiback/xenbus.c
@@ -349,26 +349,23 @@ fail:
 }
 
 
-static struct xenbus_device_id scsiback_ids[] = {
+static const struct xenbus_device_id scsiback_ids[] = {
        { "vscsi" },
        { "" }
 };
 
-static struct xenbus_driver scsiback = {
-       .name                   = "vscsi",
-       .owner                  = THIS_MODULE,
-       .ids                    = scsiback_ids,
+static DEFINE_XENBUS_DRIVER(scsiback, ,
        .probe                  = scsiback_probe,
        .remove                 = scsiback_remove,
        .otherend_changed       = scsiback_frontend_changed
-};
+);
 
 int scsiback_xenbus_init(void)
 {
-       return xenbus_register_backend(&scsiback);
+       return xenbus_register_backend(&scsiback_driver);
 }
 
 void scsiback_xenbus_unregister(void)
 {
-       xenbus_unregister_driver(&scsiback);
+       xenbus_unregister_driver(&scsiback_driver);
 }

diff --git a/drivers/scsi/xen-scsifront/xenbus.c b/drivers/scsi/xen-scsifront/xenbus.c
index 3b9f04a15f067282f1dd9c5d476d1d274eb6141f..bc5c289307c4e5c06931fb6152995bb7f5e1cde3 100644 (file)
--- a/drivers/scsi/xen-scsifront/xenbus.c
+++ b/drivers/scsi/xen-scsifront/xenbus.c
@@ -386,21 +386,18 @@ static void scsifront_backend_changed(struct xenbus_device *dev,
 }
 
 
-static struct xenbus_device_id scsifront_ids[] = {
+static const struct xenbus_device_id scsifront_ids[] = {
        { "vscsi" },
        { "" }
 };
 MODULE_ALIAS("xen:vscsi");
 
-static struct xenbus_driver scsifront_driver = {
-       .name                   = "vscsi",
-       .owner                  = THIS_MODULE,
-       .ids                    = scsifront_ids,
+static DEFINE_XENBUS_DRIVER(scsifront, ,
        .probe                  = scsifront_probe,
        .remove                 = scsifront_remove,
 /*     .resume                 = scsifront_resume, */
        .otherend_changed       = scsifront_backend_changed,
-};
+);
 
 int scsifront_xenbus_init(void)
 {