Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e106739 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

device create: convert device_create_drvdata to device_create 



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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ccea44fa

drivers/base/core.c

+4 −7
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ struct device *device_create_vargs(struct class *class, struct device *parent, 
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)

{

include/linux/device.h

+4 −5
Original line number Diff line number Diff line
@@ -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,

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);



/*