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

    ---
    arch/sh/kernel/cpu/bus.c | 34 +++++++++++++++++-----------------
    1 files changed, 17 insertions(+), 17 deletions(-)

    diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/arch/sh/kernel/cpu/bus.c linux/arch/sh/kernel/cpu/bus.c
    --- linus/arch/sh/kernel/cpu/bus.c Sun Nov 6 22:14:58 2005
    +++ linux/arch/sh/kernel/cpu/bus.c Sun Nov 13 16:11:45 2005
    @@ -53,21 +53,6 @@ static int sh_bus_resume(struct device *
    return 0;
    }

    -static struct device sh_bus_devices[SH_NR_BUSES] = {
    - {
    - .bus_id = SH_BUS_NAME_VIRT,
    - },
    -};
    -
    -struct bus_type sh_bus_types[SH_NR_BUSES] = {
    - {
    - .name = SH_BUS_NAME_VIRT,
    - .match = sh_bus_match,
    - .suspend = sh_bus_suspend,
    - .resume = sh_bus_resume,
    - },
    -};
    -
    static int sh_device_probe(struct device *dev)
    {
    struct sh_dev *shdev = to_sh_dev(dev);
    @@ -90,6 +75,23 @@ static int sh_device_remove(struct devic
    return 0;
    }

    +static struct device sh_bus_devices[SH_NR_BUSES] = {
    + {
    + .bus_id = SH_BUS_NAME_VIRT,
    + },
    +};
    +
    +struct bus_type sh_bus_types[SH_NR_BUSES] = {
    + {
    + .name = SH_BUS_NAME_VIRT,
    + .match = sh_bus_match,
    + .probe = sh_bus_probe,
    + .remove = sh_bus_remove,
    + .suspend = sh_bus_suspend,
    + .resume = sh_bus_resume,
    + },
    +};
    +
    int sh_device_register(struct sh_dev *dev)
    {
    if (!dev)
    @@ -133,8 +135,6 @@ int sh_driver_register(struct sh_driver
    return -EINVAL;
    }

    - drv->drv.probe = sh_device_probe;
    - drv->drv.remove = sh_device_remove;
    drv->drv.bus = &sh_bus_types[drv->bus_id];

    return driver_register(&drv->drv);
    -
    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:39    [W:0.022 / U:2.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site