diff options
author | Jan Beulich <JBeulich@suse.com> | 2011-12-22 04:08:13 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-01-04 17:01:17 -0500 |
commit | 73db144b58a32fc39733db6a7e1fe582072ad26a (patch) | |
tree | f03edee848be5aa085c30d493c02a5ee1b8fc3da /drivers/net/xen-netback | |
parent | 2e16341438c9eca15a2e0bb2ad8555bbdf24b86d (diff) |
Xen: consolidate and simplify struct xenbus_driver instantiation
The 'name', 'owner', and 'mod_name' members are redundant with the
identically named fields in the 'driver' sub-structure. Rather than
switching each instance to specify these fields explicitly, introduce
a macro to simplify this.
Eliminate further redundancy by allowing the drvname argument to
DEFINE_XENBUS_DRIVER() to be blank (in which case the first entry from
the ID table will be used for .driver.name).
Also eliminate the questionable xenbus_register_{back,front}end()
wrappers - their sole remaining purpose was the checking of the
'owner' field, proper setting of which shouldn't be an issue anymore
when the macro gets used.
v2: Restore DRV_NAME for the driver name in xen-pciback.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/net/xen-netback')
-rw-r--r-- | drivers/net/xen-netback/xenbus.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 1ce729d6af75..410018c4c528 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c | |||
@@ -474,17 +474,14 @@ static const struct xenbus_device_id netback_ids[] = { | |||
474 | }; | 474 | }; |
475 | 475 | ||
476 | 476 | ||
477 | static struct xenbus_driver netback = { | 477 | static DEFINE_XENBUS_DRIVER(netback, , |
478 | .name = "vif", | ||
479 | .owner = THIS_MODULE, | ||
480 | .ids = netback_ids, | ||
481 | .probe = netback_probe, | 478 | .probe = netback_probe, |
482 | .remove = netback_remove, | 479 | .remove = netback_remove, |
483 | .uevent = netback_uevent, | 480 | .uevent = netback_uevent, |
484 | .otherend_changed = frontend_changed, | 481 | .otherend_changed = frontend_changed, |
485 | }; | 482 | ); |
486 | 483 | ||
487 | int xenvif_xenbus_init(void) | 484 | int xenvif_xenbus_init(void) |
488 | { | 485 | { |
489 | return xenbus_register_backend(&netback); | 486 | return xenbus_register_backend(&netback_driver); |
490 | } | 487 | } |