From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 21 Dec 2011 20:11:13 +0000 (-0500)
Subject: xen/scsi[front|back]: consolidate and simplify struct xenbus_driver instantiation
X-Git-Tag: v2.6.39-400.9.0~595^2~6^2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d8fe05af876063d7df288db77d38ebfadebd29f6;p=users%2Fjedix%2Flinux-maple.git

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 0816c0e41b28..2869f892a212 100644
--- 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 3b9f04a15f06..bc5c289307c4 100644
--- 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)
 {