remove devfs_only()
PATCH 1/1 remove devfs_only()
Rationale: devfs_only does nothing but disabling {un,}register_blkdev and {un,}register_chrdev. {un,}register_blkdev already do nothing but adding it's name argument to a lookup table for the __bdevname and /proc/device output so this use is already bogus. The disabling of the character device per-major arrays can work in practice but is useless as any driver relying on it can't be used on non-devfs systems. (And Viro had plans to make {un,}register_chrdev behave like {un,}register_blkdev, so the same will probably happen to it in 2.7)
fs/block_dev.c +0 -4
@@ -453,8 +453,6 @@int register_blkdev (unsigned int major,const char * name,struct block_device_operations *bdops) { -if (devfs_only ()) -return 0 ;if (major ==0 ) {for (major =MAX_BLKDEV -1 ; major >0 ; major--) {if (blkdevs[major] ==NULL ) {
@@ -474,8 +472,6 @@int unregister_blkdev (unsigned int major,const char * name) { -if (devfs_only ()) -return 0 ;if (major >=MAX_BLKDEV )return -EINVAL ;if (!blkdevs[major])
fs/char_dev.c +0 -4
@@ -191,8 +191,6 @@int register_chrdev (unsigned int major,const char * name,struct file_operations *fops) { -if (devfs_only ()) -return 0 ;if (major ==0 ) {write_lock (&chrdevs_lock);for (major =MAX_CHRDEV -1 ; major >0 ; major--) {
@@ -221,8 +219,6 @@int unregister_chrdev (unsigned int major,const char * name) { -if (devfs_only ()) -return 0 ;if (major >=MAX_CHRDEV )return -EINVAL ;write_lock (&chrdevs_lock);
fs/devfs/base.c +0 -14
@@ -729,7 +729,6 @@#define OPTION_NONE 0x00#define OPTION_MOUNT 0x01 -#define OPTION_ONLY 0x02 #define PRINTK(format, args...) \ {printk (KERN_ERR "%s" format, __FUNCTION__ , ## args);}
@@ -1870,18 +1855,6 @@/** -* devfs_only - returns true if "devfs=only" is a boot option -* -* If "devfs=only" this function will return 1, otherwise 0 is returned. -*/ - -int devfs_only (void ) -{ -return (boot_options &OPTION_ONLY ) ?1 :0 ; -}/* End Function devfs_only */ - - -/** * devfs_setup - Process kernel boot options. * @str: The boot options after the "devfs=". */
@@ -1909,7 +1882,6 @@ {"dilookup", DEBUG_I_LOOKUP, &devfs_debug_init}, {"diunlink", DEBUG_I_UNLINK, &devfs_debug_init}, #endif /* CONFIG_DEVFS_DEBUG */ - {"only", OPTION_ONLY, &boot_options}, {"mount", OPTION_MOUNT, &boot_options}, {NULL, 0, NULL} };
include/linux/devfs_fs_kernel.h +0 -5
@@ -52,7 +50,6 @@ void *info);extern int devfs_generate_path (devfs_handle_t de,char *path,int buflen);extern int devfs_set_file_size (devfs_handle_t de,unsigned long size); -extern int devfs_only (void );extern int devfs_register_tape (devfs_handle_t de);extern void devfs_unregister_tape (int num);extern int devfs_alloc_unique_number (struct unique_numspace *space);
@@ -110,10 +107,6 @@static inline int devfs_set_file_size (devfs_handle_t de,unsigned long size) {return -ENOSYS ; -} -static inline int devfs_only (void ) -{ -return 0 ; }static inline int devfs_register_tape (devfs_handle_t de) {