From d8fe05af876063d7df288db77d38ebfadebd29f6 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 21 Dec 2011 15:11:13 -0500 Subject: [PATCH] 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 --- drivers/scsi/xen-scsiback/xenbus.c | 13 +++++-------- drivers/scsi/xen-scsifront/xenbus.c | 9 +++------ 2 files changed, 8 insertions(+), 14 deletions(-) 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) { -- 2.50.1