Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 2c9ede55 7d54fa64

+35 -35
+1 -1
arch/x86/kernel/cpuid.c
··· 177 177 .notifier_call = cpuid_class_cpu_callback, 178 178 }; 179 179 180 - static char *cpuid_devnode(struct device *dev, mode_t *mode) 180 + static char *cpuid_devnode(struct device *dev, umode_t *mode) 181 181 { 182 182 return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt)); 183 183 }
+1 -1
arch/x86/kernel/msr.c
··· 236 236 .notifier_call = msr_class_cpu_callback, 237 237 }; 238 238 239 - static char *msr_devnode(struct device *dev, mode_t *mode) 239 + static char *msr_devnode(struct device *dev, umode_t *mode) 240 240 { 241 241 return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt)); 242 242 }
+1 -1
block/bsg.c
··· 1070 1070 1071 1071 static struct cdev bsg_cdev; 1072 1072 1073 - static char *bsg_devnode(struct device *dev, mode_t *mode) 1073 + static char *bsg_devnode(struct device *dev, umode_t *mode) 1074 1074 { 1075 1075 return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev)); 1076 1076 }
+1 -1
block/genhd.c
··· 1109 1109 .name = "block", 1110 1110 }; 1111 1111 1112 - static char *block_devnode(struct device *dev, mode_t *mode) 1112 + static char *block_devnode(struct device *dev, umode_t *mode) 1113 1113 { 1114 1114 struct gendisk *disk = dev_to_disk(dev); 1115 1115
+2 -2
drivers/base/core.c
··· 198 198 if (MAJOR(dev->devt)) { 199 199 const char *tmp; 200 200 const char *name; 201 - mode_t mode = 0; 201 + umode_t mode = 0; 202 202 203 203 add_uevent_var(env, "MAJOR=%u", MAJOR(dev->devt)); 204 204 add_uevent_var(env, "MINOR=%u", MINOR(dev->devt)); ··· 1182 1182 * freed by the caller. 1183 1183 */ 1184 1184 const char *device_get_devnode(struct device *dev, 1185 - mode_t *mode, const char **tmp) 1185 + umode_t *mode, const char **tmp) 1186 1186 { 1187 1187 char *s; 1188 1188
+1 -1
drivers/base/devtmpfs.c
··· 40 40 struct completion done; 41 41 int err; 42 42 const char *name; 43 - mode_t mode; /* 0 => delete */ 43 + umode_t mode; /* 0 => delete */ 44 44 struct device *dev; 45 45 } *requests; 46 46
+1 -1
drivers/block/aoe/aoechr.c
··· 270 270 .llseek = noop_llseek, 271 271 }; 272 272 273 - static char *aoe_devnode(struct device *dev, mode_t *mode) 273 + static char *aoe_devnode(struct device *dev, umode_t *mode) 274 274 { 275 275 return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev)); 276 276 }
+1 -1
drivers/block/pktcdvd.c
··· 2817 2817 .check_events = pkt_check_events, 2818 2818 }; 2819 2819 2820 - static char *pktcdvd_devnode(struct gendisk *gd, mode_t *mode) 2820 + static char *pktcdvd_devnode(struct gendisk *gd, umode_t *mode) 2821 2821 { 2822 2822 return kasprintf(GFP_KERNEL, "pktcdvd/%s", gd->disk_name); 2823 2823 }
+2 -2
drivers/char/mem.c
··· 847 847 848 848 static const struct memdev { 849 849 const char *name; 850 - mode_t mode; 850 + umode_t mode; 851 851 const struct file_operations *fops; 852 852 struct backing_dev_info *dev_info; 853 853 } devlist[] = { ··· 901 901 .llseek = noop_llseek, 902 902 }; 903 903 904 - static char *mem_devnode(struct device *dev, mode_t *mode) 904 + static char *mem_devnode(struct device *dev, umode_t *mode) 905 905 { 906 906 if (mode && devlist[MINOR(dev->devt)].mode) 907 907 *mode = devlist[MINOR(dev->devt)].mode;
+1 -1
drivers/char/misc.c
··· 258 258 EXPORT_SYMBOL(misc_register); 259 259 EXPORT_SYMBOL(misc_deregister); 260 260 261 - static char *misc_devnode(struct device *dev, mode_t *mode) 261 + static char *misc_devnode(struct device *dev, umode_t *mode) 262 262 { 263 263 struct miscdevice *c = dev_get_drvdata(dev); 264 264
+1 -1
drivers/char/raw.c
··· 308 308 309 309 static struct cdev raw_cdev; 310 310 311 - static char *raw_devnode(struct device *dev, mode_t *mode) 311 + static char *raw_devnode(struct device *dev, umode_t *mode) 312 312 { 313 313 return kasprintf(GFP_KERNEL, "raw/%s", dev_name(dev)); 314 314 }
+1 -1
drivers/char/tile-srom.c
··· 329 329 __ATTR_NULL 330 330 }; 331 331 332 - static char *srom_devnode(struct device *dev, mode_t *mode) 332 + static char *srom_devnode(struct device *dev, umode_t *mode) 333 333 { 334 334 *mode = S_IRUGO | S_IWUSR; 335 335 return kasprintf(GFP_KERNEL, "srom/%s", dev_name(dev));
+1 -1
drivers/gpu/drm/drm_sysfs.c
··· 72 72 return 0; 73 73 } 74 74 75 - static char *drm_devnode(struct device *dev, mode_t *mode) 75 + static char *drm_devnode(struct device *dev, umode_t *mode) 76 76 { 77 77 return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev)); 78 78 }
+1 -1
drivers/hid/usbhid/hiddev.c
··· 859 859 .llseek = noop_llseek, 860 860 }; 861 861 862 - static char *hiddev_devnode(struct device *dev, mode_t *mode) 862 + static char *hiddev_devnode(struct device *dev, umode_t *mode) 863 863 { 864 864 return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); 865 865 }
+1 -1
drivers/infiniband/core/cm.c
··· 3659 3659 .release = cm_release_port_obj 3660 3660 }; 3661 3661 3662 - static char *cm_devnode(struct device *dev, mode_t *mode) 3662 + static char *cm_devnode(struct device *dev, umode_t *mode) 3663 3663 { 3664 3664 if (mode) 3665 3665 *mode = 0666;
+1 -1
drivers/infiniband/core/user_mad.c
··· 1175 1175 kref_put(&umad_dev->ref, ib_umad_release_dev); 1176 1176 } 1177 1177 1178 - static char *umad_devnode(struct device *dev, mode_t *mode) 1178 + static char *umad_devnode(struct device *dev, umode_t *mode) 1179 1179 { 1180 1180 return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev)); 1181 1181 }
+1 -1
drivers/infiniband/core/uverbs_main.c
··· 846 846 kfree(uverbs_dev); 847 847 } 848 848 849 - static char *uverbs_devnode(struct device *dev, mode_t *mode) 849 + static char *uverbs_devnode(struct device *dev, umode_t *mode) 850 850 { 851 851 if (mode) 852 852 *mode = 0666;
+1 -1
drivers/input/input.c
··· 1624 1624 #endif 1625 1625 }; 1626 1626 1627 - static char *input_devnode(struct device *dev, mode_t *mode) 1627 + static char *input_devnode(struct device *dev, umode_t *mode) 1628 1628 { 1629 1629 return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev)); 1630 1630 }
+1 -1
drivers/media/dvb/ddbridge/ddbridge-core.c
··· 1480 1480 .open = ddb_open, 1481 1481 }; 1482 1482 1483 - static char *ddb_devnode(struct device *device, mode_t *mode) 1483 + static char *ddb_devnode(struct device *device, umode_t *mode) 1484 1484 { 1485 1485 struct ddb *dev = dev_get_drvdata(device); 1486 1486
+1 -1
drivers/media/dvb/dvb-core/dvbdev.c
··· 450 450 return 0; 451 451 } 452 452 453 - static char *dvb_devnode(struct device *dev, mode_t *mode) 453 + static char *dvb_devnode(struct device *dev, umode_t *mode) 454 454 { 455 455 struct dvb_device *dvbdev = dev_get_drvdata(dev); 456 456
+1 -1
drivers/media/rc/rc-main.c
··· 715 715 } 716 716 717 717 /* class for /sys/class/rc */ 718 - static char *ir_devnode(struct device *dev, mode_t *mode) 718 + static char *ir_devnode(struct device *dev, umode_t *mode) 719 719 { 720 720 return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev)); 721 721 }
+1 -1
drivers/tty/tty_io.c
··· 3267 3267 } 3268 3268 } 3269 3269 3270 - static char *tty_devnode(struct device *dev, mode_t *mode) 3270 + static char *tty_devnode(struct device *dev, umode_t *mode) 3271 3271 { 3272 3272 if (!mode) 3273 3273 return NULL;
+1 -1
drivers/usb/class/usblp.c
··· 1045 1045 .llseek = noop_llseek, 1046 1046 }; 1047 1047 1048 - static char *usblp_devnode(struct device *dev, mode_t *mode) 1048 + static char *usblp_devnode(struct device *dev, umode_t *mode) 1049 1049 { 1050 1050 return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); 1051 1051 }
+1 -1
drivers/usb/core/file.c
··· 66 66 struct class *class; 67 67 } *usb_class; 68 68 69 - static char *usb_devnode(struct device *dev, mode_t *mode) 69 + static char *usb_devnode(struct device *dev, umode_t *mode) 70 70 { 71 71 struct usb_class_driver *drv; 72 72
+1 -1
drivers/usb/core/usb.c
··· 326 326 #endif /* CONFIG_PM */ 327 327 328 328 329 - static char *usb_devnode(struct device *dev, mode_t *mode) 329 + static char *usb_devnode(struct device *dev, umode_t *mode) 330 330 { 331 331 struct usb_device *usb_dev; 332 332
+1 -1
drivers/usb/misc/iowarrior.c
··· 734 734 .llseek = noop_llseek, 735 735 }; 736 736 737 - static char *iowarrior_devnode(struct device *dev, mode_t *mode) 737 + static char *iowarrior_devnode(struct device *dev, umode_t *mode) 738 738 { 739 739 return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); 740 740 }
+1 -1
drivers/usb/misc/legousbtower.c
··· 269 269 .llseek = tower_llseek, 270 270 }; 271 271 272 - static char *legousbtower_devnode(struct device *dev, mode_t *mode) 272 + static char *legousbtower_devnode(struct device *dev, umode_t *mode) 273 273 { 274 274 return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); 275 275 }
+3 -3
include/linux/device.h
··· 294 294 struct kobject *dev_kobj; 295 295 296 296 int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); 297 - char *(*devnode)(struct device *dev, mode_t *mode); 297 + char *(*devnode)(struct device *dev, umode_t *mode); 298 298 299 299 void (*class_release)(struct class *class); 300 300 void (*dev_release)(struct device *dev); ··· 423 423 const char *name; 424 424 const struct attribute_group **groups; 425 425 int (*uevent)(struct device *dev, struct kobj_uevent_env *env); 426 - char *(*devnode)(struct device *dev, mode_t *mode); 426 + char *(*devnode)(struct device *dev, umode_t *mode); 427 427 void (*release)(struct device *dev); 428 428 429 429 const struct dev_pm_ops *pm; ··· 720 720 extern int device_move(struct device *dev, struct device *new_parent, 721 721 enum dpm_order dpm_order); 722 722 extern const char *device_get_devnode(struct device *dev, 723 - mode_t *mode, const char **tmp); 723 + umode_t *mode, const char **tmp); 724 724 extern void *dev_get_drvdata(const struct device *dev); 725 725 extern int dev_set_drvdata(struct device *dev, void *data); 726 726
+1 -1
include/linux/genhd.h
··· 163 163 * disks that can't be partitioned. */ 164 164 165 165 char disk_name[DISK_NAME_LEN]; /* name of major driver */ 166 - char *(*devnode)(struct gendisk *gd, mode_t *mode); 166 + char *(*devnode)(struct gendisk *gd, umode_t *mode); 167 167 168 168 unsigned int events; /* supported events */ 169 169 unsigned int async_events; /* async events, subset of all */
+1 -1
include/linux/usb.h
··· 935 935 */ 936 936 struct usb_class_driver { 937 937 char *name; 938 - char *(*devnode)(struct device *dev, mode_t *mode); 938 + char *(*devnode)(struct device *dev, umode_t *mode); 939 939 const struct file_operations *fops; 940 940 int minor_base; 941 941 };
+1 -1
sound/sound_core.c
··· 29 29 MODULE_AUTHOR("Alan Cox"); 30 30 MODULE_LICENSE("GPL"); 31 31 32 - static char *sound_devnode(struct device *dev, mode_t *mode) 32 + static char *sound_devnode(struct device *dev, umode_t *mode) 33 33 { 34 34 if (MAJOR(dev->devt) == SOUND_MAJOR) 35 35 return NULL;