staging: comedi: make 'in_request_module' a bool bit-field

Change the `in_request_module` member of `struct comedi_device` to a
1-bit bit-field of type `bool` and move it into a suitable hole in the
data type to save a few bytes.  Change the assigned values to `true` and
`false`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index e336b281b847768053198e9350d862a59555ee8d..6bcbb52510ef9e2b82ffd8c6cb1b329e40e78ae2 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2067,12 +2067,12 @@ static int comedi_open(struct inode *inode, struct file *file)
        /* This is slightly hacky, but we want module autoloading
         * to work for root.
         * case: user opens device, attached -> ok
-        * case: user opens device, unattached, in_request_module=0 -> autoload
-        * case: user opens device, unattached, in_request_module=1 -> fail
+        * case: user opens device, unattached, !in_request_module -> autoload
+        * case: user opens device, unattached, in_request_module -> fail
         * case: root opens device, attached -> ok
-        * case: root opens device, unattached, in_request_module=1 -> ok
+        * case: root opens device, unattached, in_request_module -> ok
         *   (typically called from modprobe)
-        * case: root opens device, unattached, in_request_module=0 -> autoload
+        * case: root opens device, unattached, !in_request_module -> autoload
         *
         * The last could be changed to "-> ok", which would deny root
         * autoloading.
@@ -2088,7 +2088,7 @@ static int comedi_open(struct inode *inode, struct file *file)
        if (capable(CAP_NET_ADMIN) && dev->in_request_module)
                goto ok;
 
-       dev->in_request_module = 1;
+       dev->in_request_module = true;
 
 #ifdef CONFIG_KMOD
        mutex_unlock(&dev->mutex);
@@ -2096,7 +2096,7 @@ static int comedi_open(struct inode *inode, struct file *file)
        mutex_lock(&dev->mutex);
 #endif
 
-       dev->in_request_module = 0;
+       dev->in_request_module = false;
 
        if (!dev->attached && !capable(CAP_NET_ADMIN)) {
                DPRINTK("not attached and not CAP_NET_ADMIN\n");

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index bdd2936e509b42c7a0bd6b28180cebcf2f6a059f..86de4ff9501aea6c3bbbad47fa2f858540b1b6d3 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -208,9 +208,9 @@ struct comedi_device {
        const char *board_name;
        const void *board_ptr;
        bool attached:1;
+       bool in_request_module:1;
        spinlock_t spinlock;
        struct mutex mutex;
-       int in_request_module;
 
        int n_subdevices;
        struct comedi_subdevice *subdevices;