lkml.org 
[lkml]   [2006]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[CFT 16/29] Add i2c_bus_type probe and remove methods
    Date
    From
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

    ---
    drivers/i2c/i2c-core.c | 20 +++++++++-----------
    1 files changed, 9 insertions(+), 11 deletions(-)

    diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/drivers/i2c/i2c-core.c linux/drivers/i2c/i2c-core.c
    --- linus/drivers/i2c/i2c-core.c Sun Nov 6 22:15:59 2005
    +++ linux/drivers/i2c/i2c-core.c Sun Nov 13 16:21:32 2005
    @@ -63,13 +63,6 @@ static int i2c_bus_resume(struct device
    return rc;
    }

    -struct bus_type i2c_bus_type = {
    - .name = "i2c",
    - .match = i2c_device_match,
    - .suspend = i2c_bus_suspend,
    - .resume = i2c_bus_resume,
    -};
    -
    static int i2c_device_probe(struct device *dev)
    {
    return -ENODEV;
    @@ -80,6 +73,15 @@ static int i2c_device_remove(struct devi
    return 0;
    }

    +struct bus_type i2c_bus_type = {
    + .name = "i2c",
    + .match = i2c_device_match,
    + .probe = i2c_device_probe,
    + .remove = i2c_device_remove,
    + .suspend = i2c_bus_suspend,
    + .resume = i2c_bus_resume,
    +};
    +
    void i2c_adapter_dev_release(struct device *dev)
    {
    struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
    @@ -90,8 +92,6 @@ struct device_driver i2c_adapter_driver
    .owner = THIS_MODULE,
    .name = "i2c_adapter",
    .bus = &i2c_bus_type,
    - .probe = i2c_device_probe,
    - .remove = i2c_device_remove,
    };

    static void i2c_adapter_class_dev_release(struct class_device *dev)
    @@ -298,8 +298,6 @@ int i2c_add_driver(struct i2c_driver *dr
    driver->driver.owner = driver->owner;
    driver->driver.name = driver->name;
    driver->driver.bus = &i2c_bus_type;
    - driver->driver.probe = i2c_device_probe;
    - driver->driver.remove = i2c_device_remove;

    res = driver_register(&driver->driver);
    if (res)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-01-05 15:42    [W:0.019 / U:29.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site