1 files changed, 18 insertions, 22 deletions

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 5dd0386604f0..8f6a28921ed4 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1001,7 +1001,7 @@ static void imon_touch_display_timeout(unsigned long data)
  * it is not, so we must acquire it prior to calling send_packet, which
  * requires that the lock is held.
  */
-static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
+static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type)
 {
         int retval;
         struct imon_context *ictx = rc->priv;
@@ -1010,31 +1010,27 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
         unsigned char ir_proto_packet[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
 
-        if (rc_type && !(rc_type & rc->allowed_protos))
+        if (*rc_type && !(*rc_type & rc->allowed_protos))
                 dev_warn(dev, "Looks like you're trying to use an IR protocol "
                          "this device does not support\n");
 
-        switch (rc_type) {
-        case RC_TYPE_RC6:
+        if (*rc_type & RC_BIT_RC6_MCE) {
                 dev_dbg(dev, "Configuring IR receiver for MCE protocol\n");
                 ir_proto_packet[0] = 0x01;
-                break;
-        case RC_TYPE_UNKNOWN:
-        case RC_TYPE_OTHER:
+                *rc_type = RC_BIT_RC6_MCE;
+        } else if (*rc_type & RC_BIT_OTHER) {
                 dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
                 if (!pad_stabilize)
                         dev_dbg(dev, "PAD stabilize functionality disabled\n");
                 /* ir_proto_packet[0] = 0x00; // already the default */
-                rc_type = RC_TYPE_OTHER;
-                break;
-        default:
+                *rc_type = RC_BIT_OTHER;
+        } else {
                 dev_warn(dev, "Unsupported IR protocol specified, overriding "
                          "to iMON IR protocol\n");
                 if (!pad_stabilize)
                         dev_dbg(dev, "PAD stabilize functionality disabled\n");
                 /* ir_proto_packet[0] = 0x00; // already the default */
-                rc_type = RC_TYPE_OTHER;
-                break;
+                *rc_type = RC_BIT_OTHER;
         }
 
         memcpy(ictx->usb_tx_buf, &ir_proto_packet, sizeof(ir_proto_packet));
@@ -1048,7 +1044,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
         if (retval)
                 goto out;
 
-        ictx->rc_type = rc_type;
+        ictx->rc_type = *rc_type;
         ictx->pad_mouse = false;
 
 out:
@@ -1323,7 +1319,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
                 rel_x = buf[2];
                 rel_y = buf[3];
 
-                if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
+                if (ictx->rc_type == RC_BIT_OTHER && pad_stabilize) {
                         if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
                                 dir = stabilize((int)rel_x, (int)rel_y,
                                                 timeout, threshold);
@@ -1390,7 +1386,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
                 buf[0] = 0x01;
                 buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
 
-                if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
+                if (ictx->rc_type == RC_BIT_OTHER && pad_stabilize) {
                         dir = stabilize((int)rel_x, (int)rel_y,
                                         timeout, threshold);
                         if (!dir) {
@@ -1511,7 +1507,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
                 kc = imon_panel_key_lookup(scancode);
         } else {
                 scancode = be32_to_cpu(*((u32 *)buf));
-                if (ictx->rc_type == RC_TYPE_RC6) {
+                if (ictx->rc_type == RC_BIT_RC6_MCE) {
                         ktype = IMON_KEY_IMON;
                         if (buf[0] == 0x80)
                                 ktype = IMON_KEY_MCE;
@@ -1744,7 +1740,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 {
         u8 ffdc_cfg_byte = ictx->usb_rx_buf[6];
         u8 detected_display_type = IMON_DISPLAY_TYPE_NONE;
-        u64 allowed_protos = RC_TYPE_OTHER;
+        u64 allowed_protos = RC_BIT_OTHER;
 
         switch (ffdc_cfg_byte) {
         /* iMON Knob, no display, iMON IR + vol knob */
@@ -1775,13 +1771,13 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
         case 0x9e:
                 dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
                 detected_display_type = IMON_DISPLAY_TYPE_VFD;
-                allowed_protos = RC_TYPE_RC6;
+                allowed_protos = RC_BIT_RC6_MCE;
                 break;
         /* iMON LCD, MCE IR */
         case 0x9f:
                 dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
                 detected_display_type = IMON_DISPLAY_TYPE_LCD;
-                allowed_protos = RC_TYPE_RC6;
+                allowed_protos = RC_BIT_RC6_MCE;
                 break;
         default:
                 dev_info(ictx->dev, "Unknown 0xffdc device, "
@@ -1789,7 +1785,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                 detected_display_type = IMON_DISPLAY_TYPE_VFD;
                 /* We don't know which one it is, allow user to set the
                  * RC6 one from userspace if OTHER wasn't correct. */
-                allowed_protos |= RC_TYPE_RC6;
+                allowed_protos |= RC_BIT_RC6_MCE;
                 break;
         }
 
@@ -1875,7 +1871,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
 
         rdev->priv = ictx;
         rdev->driver_type = RC_DRIVER_SCANCODE;
-        rdev->allowed_protos = RC_TYPE_OTHER | RC_TYPE_RC6; /* iMON PAD or MCE */
+        rdev->allowed_protos = RC_BIT_OTHER | RC_BIT_RC6_MCE; /* iMON PAD or MCE */
         rdev->change_protocol = imon_ir_change_protocol;
         rdev->driver_name = MOD_NAME;
 
@@ -1893,7 +1889,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
 
         imon_set_display_type(ictx);
 
-        if (ictx->rc_type == RC_TYPE_RC6)
+        if (ictx->rc_type == RC_BIT_RC6_MCE)
                 rdev->map_name = RC_MAP_IMON_MCE;
         else
                 rdev->map_name = RC_MAP_IMON_PAD;