Commit 2c9ede55 authored by Al Viro's avatar Al Viro
Browse files

switch device_get_devnode() and ->devnode() to umode_t * 



both callers of device_get_devnode() are only interested in lower 16bits
and nobody tries to return anything wider than 16bit anyway.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7d54fa64

arch/x86/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier = 
	.notifier_call = cpuid_class_cpu_callback,

};



static char *cpuid_devnode(struct device *dev, mode_t *mode)

static char *cpuid_devnode(struct device *dev, umode_t *mode)

{

	return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));

}

arch/x86/kernel/msr.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static struct notifier_block __refdata msr_class_cpu_notifier = { 
	.notifier_call = msr_class_cpu_callback,

};



static char *msr_devnode(struct device *dev, mode_t *mode)

static char *msr_devnode(struct device *dev, umode_t *mode)

{

	return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt));

}

block/bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue); 


static struct cdev bsg_cdev;



static char *bsg_devnode(struct device *dev, mode_t *mode)

static char *bsg_devnode(struct device *dev, umode_t *mode)

{

	return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));

}

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ struct class block_class = { 
	.name		= "block",

};



static char *block_devnode(struct device *dev, mode_t *mode)

static char *block_devnode(struct device *dev, umode_t *mode)

{

	struct gendisk *disk = dev_to_disk(dev);

drivers/base/core.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, 
	if (MAJOR(dev->devt)) {

		const char *tmp;

		const char *name;

		mode_t mode = 0;

		umode_t mode = 0;



		add_uevent_var(env, "MAJOR=%u", MAJOR(dev->devt));

		add_uevent_var(env, "MINOR=%u", MINOR(dev->devt));
@@ -1182,7 +1182,7 @@ static struct device *next_device(struct klist_iter *i) 
 * freed by the caller.

 */

const char *device_get_devnode(struct device *dev,

			       mode_t *mode, const char **tmp)

			       umode_t *mode, const char **tmp)

{

	char *s;