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

    ---
    arch/arm/mach-integrator/lm.c | 36 ++++++++++++++++++------------------
    1 files changed, 18 insertions(+), 18 deletions(-)

    diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/arch/arm/mach-integrator/lm.c linux/arch/arm/mach-integrator/lm.c
    --- linus/arch/arm/mach-integrator/lm.c Sun Nov 6 22:14:16 2005
    +++ linux/arch/arm/mach-integrator/lm.c Sun Nov 13 15:57:58 2005
    @@ -22,20 +22,6 @@ static int lm_match(struct device *dev,
    return 1;
    }

    -static struct bus_type lm_bustype = {
    - .name = "logicmodule",
    - .match = lm_match,
    -// .suspend = lm_suspend,
    -// .resume = lm_resume,
    -};
    -
    -static int __init lm_init(void)
    -{
    - return bus_register(&lm_bustype);
    -}
    -
    -postcore_initcall(lm_init);
    -
    static int lm_bus_probe(struct device *dev)
    {
    struct lm_device *lmdev = to_lm_device(dev);
    @@ -49,16 +35,30 @@ static int lm_bus_remove(struct device *
    struct lm_device *lmdev = to_lm_device(dev);
    struct lm_driver *lmdrv = to_lm_driver(dev->driver);

    - lmdrv->remove(lmdev);
    + if (lmdrv->remove)
    + lmdrv->remove(lmdev);
    return 0;
    }

    +static struct bus_type lm_bustype = {
    + .name = "logicmodule",
    + .match = lm_match,
    + .probe = lm_bus_probe,
    + .remove = lm_bus_remove,
    +// .suspend = lm_bus_suspend,
    +// .resume = lm_bus_resume,
    +};
    +
    +static int __init lm_init(void)
    +{
    + return bus_register(&lm_bustype);
    +}
    +
    +postcore_initcall(lm_init);
    +
    int lm_driver_register(struct lm_driver *drv)
    {
    drv->drv.bus = &lm_bustype;
    - drv->drv.probe = lm_bus_probe;
    - drv->drv.remove = lm_bus_remove;
    -
    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:37    [W:0.021 / U:120.264 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site