Remove the devfs_should* functions I added, and replace them with one devfs_only...

This now explains what is really going on much better than before.

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4b65320f33c056d1c8bcae5c141be9a0886388f5..62c973eeb2789a5afee6fffae93786596c4da551 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -453,7 +453,7 @@ struct block_device_operations * get_blkfops(unsigned int major)
 
 int register_blkdev(unsigned int major, const char * name, struct block_device_operations *bdops)
 {
-       if (devfs_should_register_blkdev())
+       if (devfs_only())
                return 0;
        if (major == 0) {
                for (major = MAX_BLKDEV-1; major > 0; major--) {
@@ -476,7 +476,7 @@ int register_blkdev(unsigned int major, const char * name, struct block_device_o
 
 int unregister_blkdev(unsigned int major, const char * name)
 {
-       if (devfs_should_unregister_blkdev())
+       if (devfs_only())
                return 0;
        if (major >= MAX_BLKDEV)
                return -EINVAL;

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 90d8bf08d72eb96858d65957d8e929c940e7634b..7731d36ef133c0fddb3770efc6ad17367d8286d1 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -2228,60 +2228,18 @@ const char *devfs_get_name (devfs_handle_t de, unsigned int *namelen)
 
 
 /**
- *     devfs_should_register_chrdev - should we register a conventional character driver.
+ *     devfs_only - returns if "devfs=only" is a boot option
  *
- *     If "devfs=only" this function will return -1, otherwise 0 is returned.
+ *     If "devfs=only" this function will return 1, otherwise 0 is returned.
  */
-int devfs_should_register_chrdev (void)
+int devfs_only (void)
 {
     if (boot_options & OPTION_ONLY)
-           return -1;
+           return 1;
     return 0;
 }
 
 
-/**
- *     devfs_should_register_blkdev - should we register a conventional block driver.
- *
- *     If the "devfs=only" option was provided at boot time, this function will
- *     return -1, otherwise 0 is returned.
- */
-
-int devfs_should_register_blkdev (void)
-{
-    if (boot_options & OPTION_ONLY)
-           return -1;
-    return 0;
-}
-
-
-/**
- *     devfs_should_unregister_chrdev - should we unregister a conventional character driver.
- *
- *     If "devfs=only" this function will return -1, otherwise 0 is returned
- */
-int devfs_should_unregister_chrdev (void)
-{
-    if (boot_options & OPTION_ONLY)
-           return -1;
-    return 0;
-}
-
-
-/**
- *     devfs_should_unregister_blkdev - should we unregister a conventional block driver.
- *
- *     If the "devfs=only" option was provided at boot time, this function will
- *     return -1, otherwise 0 is returned.
- */
-
-int devfs_should_unregister_blkdev (void)
-{
-    if (boot_options & OPTION_ONLY)
-           return -1;
-    return 0;
-}
-
 /**
  *     devfs_setup - Process kernel boot options.
  *     @str: The boot options after the "devfs=".

diff --git a/fs/devices.c b/fs/devices.c
index eb242107eacf53c8bc4513027e37f68f21bd424b..69874923b79f117f96f32cab0528fb232f3384af 100644 (file)
--- a/fs/devices.c
+++ b/fs/devices.c
@@ -98,7 +98,7 @@ static struct file_operations * get_chrfops(unsigned int major, unsigned int min
 
 int register_chrdev(unsigned int major, const char * name, struct file_operations *fops)
 {
-       if (devfs_should_register_chrdev())
+       if (devfs_only())
                return 0;
        if (major == 0) {
                write_lock(&chrdevs_lock);
@@ -128,7 +128,7 @@ int register_chrdev(unsigned int major, const char * name, struct file_operation
 
 int unregister_chrdev(unsigned int major, const char * name)
 {
-       if (devfs_should_register_chrdev())
+       if (devfs_only())
                return 0;
        if (major >= MAX_CHRDEV)
                return -EINVAL;

diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index a75beebfb65262ff5ffc93ff79c6f2991768e8c0..d93fce08bc3ef0950934a1feec5981836b5f6a1f 100644 (file)
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -94,10 +94,7 @@ extern devfs_handle_t devfs_get_next_sibling (devfs_handle_t de);
 extern void devfs_auto_unregister (devfs_handle_t master,devfs_handle_t slave);
 extern devfs_handle_t devfs_get_unregister_slave (devfs_handle_t master);
 extern const char *devfs_get_name (devfs_handle_t de, unsigned int *namelen);
-extern int devfs_should_register_chrdev (void);
-extern int devfs_should_register_blkdev (void);
-extern int devfs_should_unregister_chrdev (void);
-extern int devfs_should_unregister_blkdev (void);
+extern int devfs_only (void);
 
 extern void devfs_register_tape (devfs_handle_t de);
 extern void devfs_register_series (devfs_handle_t dir, const char *format,
@@ -237,19 +234,7 @@ static inline const char *devfs_get_name (devfs_handle_t de,
 {
     return NULL;
 }
-static inline int devfs_should_register_chrdev (void)
-{
-    return 0;
-}
-static inline int devfs_should_register_blkdev (void)
-{
-    return 0;
-}
-static inline int devfs_should_unregister_chrdev (void)
-{
-    return 0;
-}
-static inline int devfs_should_unregister_blkdev (void)
+static inline int devfs_only (void)
 {
     return 0;
 }