lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

device create: convert device_create_drvdata to device_create

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2008-07-21 20:03:34 -07:00
parent ccea44fadc
commit 4e10673944
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/core.c
View File

@@ -1236,7 +1236,7 @@ error:
EXPORT_SYMBOL_GPL(device_create_vargs); 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 * @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 * @parent: pointer to the parent struct device of this new device, if any
* @devt: the dev_t for the char device to be added * @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 * Note: the struct class passed to this function must have previously
* been created with a call to class_create(). * been created with a call to class_create().
*/ */
struct device *device_create_drvdata(struct class *class, struct device *device_create(struct class *class, struct device *parent,
struct device *parent, dev_t devt, void *drvdata, const char *fmt, ...)
dev_t devt,
void *drvdata,
const char *fmt, ...)
{ {
va_list vargs; va_list vargs;
struct device *dev; struct device *dev;
@@ -1271,7 +1268,7 @@ struct device *device_create_drvdata(struct class *class,
va_end(vargs); va_end(vargs);
return dev; return dev;
} }
EXPORT_SYMBOL_GPL(device_create_drvdata); EXPORT_SYMBOL_GPL(device_create);
static int __match_devt(struct device *dev, void *data) static int __match_devt(struct device *dev, void *data)
{ {

9
include/linux/device.h
View File

@@ -470,12 +470,11 @@ extern struct device *device_create_vargs(struct class *cls,
void *drvdata, void *drvdata,
const char *fmt, const char *fmt,
va_list vargs); va_list vargs);
extern struct device *device_create_drvdata(struct class *cls, extern struct device *device_create(struct class *cls, struct device *parent,
struct device *parent, dev_t devt, void *drvdata,
dev_t devt, const char *fmt, ...)
void *drvdata,
const char *fmt, ...)
__attribute__((format(printf, 5, 6))); __attribute__((format(printf, 5, 6)));
#define device_create_drvdata device_create
extern void device_destroy(struct class *cls, dev_t devt); extern void device_destroy(struct class *cls, dev_t devt);
/* /*