From 8ad4822861c5e7e3e29e60e92410fc360d99fc79 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 13 Jun 2008 13:46:40 +0100 Subject: [PATCH] --- yaml --- r: 105767 b: refs/heads/master c: e962fa660d391fc9b90988e6538c94c858c099f9 h: refs/heads/master i: 105765: 8ed28111a6e30361efcb6430c4cce93c5fb81ec6 105763: 57067a502755dd2cf643557b1ad11600f8ea3a3f 105759: b3c42095ffca20dd390e951e47617d753711cf4d v: v3 --- [refs] | 2 +- trunk/drivers/virtio/virtio.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d4fa981431cc..d73b31e1fcf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44653eae1407f79dff6f52fcf594ae84cb165ec4 +refs/heads/master: e962fa660d391fc9b90988e6538c94c858c099f9 diff --git a/trunk/drivers/virtio/virtio.c b/trunk/drivers/virtio/virtio.c index 7084e7e146c0..fc85cba64578 100644 --- a/trunk/drivers/virtio/virtio.c +++ b/trunk/drivers/virtio/virtio.c @@ -71,13 +71,6 @@ static int virtio_uevent(struct device *_dv, struct kobj_uevent_env *env) dev->id.device, dev->id.vendor); } -static struct bus_type virtio_bus = { - .name = "virtio", - .match = virtio_dev_match, - .dev_attrs = virtio_dev_attrs, - .uevent = virtio_uevent, -}; - static void add_status(struct virtio_device *dev, unsigned status) { dev->config->set_status(dev, dev->config->get_status(dev) | status); @@ -147,13 +140,20 @@ static int virtio_dev_remove(struct device *_d) return 0; } +static struct bus_type virtio_bus = { + .name = "virtio", + .match = virtio_dev_match, + .dev_attrs = virtio_dev_attrs, + .uevent = virtio_uevent, + .probe = virtio_dev_probe, + .remove = virtio_dev_remove, +}; + int register_virtio_driver(struct virtio_driver *driver) { /* Catch this early. */ BUG_ON(driver->feature_table_size && !driver->feature_table); driver->driver.bus = &virtio_bus; - driver->driver.probe = virtio_dev_probe; - driver->driver.remove = virtio_dev_remove; return driver_register(&driver->driver); } EXPORT_SYMBOL_GPL(register_virtio_driver);