lkml.org 
[lkml]   [2008]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 30/79] device create: convert device_create_drvdata to device_create
    Date
    Now that device_create() has been audited, rename things back to the
    original call to be sane.

    Keep the device_create_drvdata macro around to make merges easier.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/base/core.c | 11 ++++-------
    include/linux/device.h | 9 ++++-----
    2 files changed, 8 insertions(+), 12 deletions(-)

    diff --git a/drivers/base/core.c b/drivers/base/core.c
    index 4dc0d27..9ae28aa 100644
    --- a/drivers/base/core.c
    +++ b/drivers/base/core.c
    @@ -1236,7 +1236,7 @@ error:
    EXPORT_SYMBOL_GPL(device_create_vargs);

    /**
    - * device_create_drvdata - creates a device and registers it with sysfs
    + * device_create - creates a device and registers it with sysfs
    * @class: pointer to the struct class that this device should be registered to
    * @parent: pointer to the parent struct device of this new device, if any
    * @devt: the dev_t for the char device to be added
    @@ -1257,11 +1257,8 @@ EXPORT_SYMBOL_GPL(device_create_vargs);
    * Note: the struct class passed to this function must have previously
    * been created with a call to class_create().
    */
    -struct device *device_create_drvdata(struct class *class,
    - struct device *parent,
    - dev_t devt,
    - void *drvdata,
    - const char *fmt, ...)
    +struct device *device_create(struct class *class, struct device *parent,
    + dev_t devt, void *drvdata, const char *fmt, ...)
    {
    va_list vargs;
    struct device *dev;
    @@ -1271,7 +1268,7 @@ struct device *device_create_drvdata(struct class *class,
    va_end(vargs);
    return dev;
    }
    -EXPORT_SYMBOL_GPL(device_create_drvdata);
    +EXPORT_SYMBOL_GPL(device_create);

    static int __match_devt(struct device *dev, void *data)
    {
    diff --git a/include/linux/device.h b/include/linux/device.h
    index a3ef5a2..de17871 100644
    --- a/include/linux/device.h
    +++ b/include/linux/device.h
    @@ -470,12 +470,11 @@ extern struct device *device_create_vargs(struct class *cls,
    void *drvdata,
    const char *fmt,
    va_list vargs);
    -extern struct device *device_create_drvdata(struct class *cls,
    - struct device *parent,
    - dev_t devt,
    - void *drvdata,
    - const char *fmt, ...)
    +extern struct device *device_create(struct class *cls, struct device *parent,
    + dev_t devt, void *drvdata,
    + const char *fmt, ...)
    __attribute__((format(printf, 5, 6)));
    +#define device_create_drvdata device_create
    extern void device_destroy(struct class *cls, dev_t devt);

    /*
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2008-07-22 07:33    [W:0.025 / U:393.412 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site