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 24/29] Add ccwgroup_bus_type probe and remove methods
    Date
    From
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

    ---
    drivers/s390/cio/ccwgroup.c | 16 +++++++++-------
    1 files changed, 9 insertions(+), 7 deletions(-)

    diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/drivers/s390/cio/ccwgroup.c linux/drivers/s390/cio/ccwgroup.c
    --- linus/drivers/s390/cio/ccwgroup.c Mon Nov 7 19:57:56 2005
    +++ linux/drivers/s390/cio/ccwgroup.c Sun Nov 13 16:35:57 2005
    @@ -52,11 +52,7 @@ ccwgroup_hotplug (struct device *dev, ch
    return 0;
    }

    -static struct bus_type ccwgroup_bus_type = {
    - .name = "ccwgroup",
    - .match = ccwgroup_bus_match,
    - .hotplug = ccwgroup_hotplug,
    -};
    +static struct bus_type ccwgroup_bus_type;

    static inline void
    __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
    @@ -389,6 +385,14 @@ ccwgroup_remove (struct device *dev)
    return 0;
    }

    +static struct bus_type ccwgroup_bus_type = {
    + .name = "ccwgroup",
    + .match = ccwgroup_bus_match,
    + .hotplug = ccwgroup_hotplug,
    + .probe = ccwgroup_probe,
    + .remove = ccwgroup_remove,
    +};
    +
    int
    ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
    {
    @@ -396,8 +400,6 @@ ccwgroup_driver_register (struct ccwgrou
    cdriver->driver = (struct device_driver) {
    .bus = &ccwgroup_bus_type,
    .name = cdriver->name,
    - .probe = ccwgroup_probe,
    - .remove = ccwgroup_remove,
    };

    return driver_register(&cdriver->driver);
    -
    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:46    [W:0.021 / U:2.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site