lkml.org 
[lkml]   [2008]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] virtio: Use bus_type probe and remove methods
    Date
    Hook up to the probe() and remove() methods in bus_type
    rather than device_driver. The latter has been preferred
    since 2.6.16.

    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    drivers/virtio/virtio.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
    index 0f3c2bb..ab0aca7 100644
    --- a/drivers/virtio/virtio.c
    +++ b/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);
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-06-13 14:49    [W:4.104 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site