lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the driver-core tree with the powerpc tree
    Hi Greg,

    Today's linux-next merge of the driver-core tree got a conflict in
    drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove
    legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8
    ("Eliminate get_driver() and put_driver()") from the driver-core tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc drivers/base/driver.c
    index db4f54c,60e4f77..0000000
    --- a/drivers/base/driver.c
    +++ b/drivers/base/driver.c
    @@@ -123,34 -123,36 +123,6 @@@ void driver_remove_file(struct device_d
    }
    EXPORT_SYMBOL_GPL(driver_remove_file);

    --/**
    - * get_driver - increment driver reference count.
    - * @drv: driver.
    - */
    - struct device_driver *get_driver(struct device_driver *drv)
    - {
    - if (drv) {
    - struct driver_private *priv;
    - struct kobject *kobj;
    - kobj = kobject_get(&drv->p->kobj);
    - priv = to_driver(kobj);
    - return priv->driver;
    - }
    - return NULL;
    - }
    - EXPORT_SYMBOL_GPL(get_driver);
    - /**
    - * put_driver - decrement driver's refcount.
    - * @drv: driver.
    - */
    - void put_driver(struct device_driver *drv)
    - {
    - kobject_put(&drv->p->kobj);
    - }
    - EXPORT_SYMBOL_GPL(put_driver);
    - * driver_add_kobj - add a kobject below the specified driver
    - * @drv: requesting device driver
    - * @kobj: kobject to add below this driver
    - * @fmt: format string that names the kobject
    - *
    - * You really don't want to do this, this is only here due to one looney
    - * iseries driver, go poke those developers if you are annoyed about
    - * this...
    - */
    -int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
    - const char *fmt, ...)
    -{
    - va_list args;
    - char *name;
    - int ret;
    -
    - va_start(args, fmt);
    - name = kvasprintf(GFP_KERNEL, fmt, args);
    - va_end(args);
    -
    - if (!name)
    - return -ENOMEM;
    -
    - ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
    - kfree(name);
    - return ret;
    -}
    -EXPORT_SYMBOL_GPL(driver_add_kobj);
    -
    static int driver_add_groups(struct device_driver *drv,
    const struct attribute_group **groups)
    {
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-03-09 06:43    [W:0.026 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site