6 files changed, 9 insertions, 8 deletions

diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index 93ff6a7f2354..3f1342c98b46 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -478,7 +478,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         dev->priv = core;
         dev->open = cx88_ir_open;
         dev->close = cx88_ir_close;
-        dev->scanmask = hardware_mask;
+        dev->scancode_mask = hardware_mask;
 
         if (ir->sampling) {
                 dev->driver_type = RC_DRIVER_IR_RAW;
diff --git a/drivers/media/pci/ttpci/budget-ci.c b/drivers/media/pci/ttpci/budget-ci.c
index 41ce7dec60e6..1feeeff3681b 100644
--- a/drivers/media/pci/ttpci/budget-ci.c
+++ b/drivers/media/pci/ttpci/budget-ci.c
@@ -234,7 +234,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 break;
         }
         if (!budget_ci->ir.full_rc5)
-                dev->scanmask = 0xff;
+                dev->scancode_mask = 0xff;
 
         error = rc_register_device(dev);
         if (error) {
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index c3fb8f8f192b..39e4b5ffe141 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -285,8 +285,8 @@ static unsigned int ir_establish_scancode(struct rc_dev *dev,
          * IR tables from other remotes. So, we support specifying a mask to
          * indicate the valid bits of the scancodes.
          */
-        if (dev->scanmask)
-                scancode &= dev->scanmask;
+        if (dev->scancode_mask)
+                scancode &= dev->scancode_mask;
 
         /* First check if we already have a mapping for this ir command */
         for (i = 0; i < rc_map->len; i++) {
diff --git a/drivers/media/usb/cx231xx/cx231xx-input.c b/drivers/media/usb/cx231xx/cx231xx-input.c
index adcdd92179b2..05f0434919d4 100644
--- a/drivers/media/usb/cx231xx/cx231xx-input.c
+++ b/drivers/media/usb/cx231xx/cx231xx-input.c
@@ -91,7 +91,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         dev->init_data.get_key = get_key_isdbt;
         dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name;
         /* The i2c micro-controller only outputs the cmd part of NEC protocol */
-        dev->init_data.rc_dev->scanmask = 0xff;
+        dev->init_data.rc_dev->scancode_mask = 0xff;
         dev->init_data.rc_dev->driver_name = "cx231xx";
         dev->init_data.type = RC_BIT_NEC;
         info.addr = 0x30;
diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c
index 8a519f51609a..26b2ebb62547 100644
--- a/drivers/media/usb/tm6000/tm6000-input.c
+++ b/drivers/media/usb/tm6000/tm6000-input.c
@@ -443,7 +443,7 @@ int tm6000_ir_init(struct tm6000_core *dev)
         /* input setup */
         rc->allowed_protocols = RC_BIT_RC5 | RC_BIT_NEC;
         /* Neded, in order to support NEC remotes with 24 or 32 bits */
-        rc->scanmask = 0xffff;
+        rc->scancode_mask = 0xffff;
         rc->priv = ir;
         rc->change_protocol = tm6000_ir_change_protocol;
         if (dev->int_in.endp) {
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 4f9e187d05bf..3047837db1cc 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -80,11 +80,12 @@ enum rc_filter_type {
  * @enabled_wakeup_protocols: bitmask with the enabled RC_BIT_* wakeup protocols
  * @scancode_filter: scancode filter
  * @scancode_wakeup_filter: scancode wakeup filters
- * @scanmask: some hardware decoders are not capable of providing the full
+ * @scancode_mask: some hardware decoders are not capable of providing the full
  *      scancode to the application. As this is a hardware limit, we can't do
  *      anything with it. Yet, as the same keycode table can be used with other
  *      devices, a mask is provided to allow its usage. Drivers should generally
  *      leave this field in blank
+ * @users: number of current users of the device
  * @priv: driver-specific data
  * @keylock: protects the remaining members of the struct
  * @keypressed: whether a key is currently pressed
@@ -139,8 +140,8 @@ struct rc_dev {
         u64                             enabled_wakeup_protocols;
         struct rc_scancode_filter       scancode_filter;
         struct rc_scancode_filter       scancode_wakeup_filter;
+        u32                             scancode_mask;
         u32                             users;
-        u32                             scanmask;
         void                            *priv;
         spinlock_t                      keylock;
         bool                            keypressed;