[media] rc-core: remove protocol arrays

The basic API of rc-core used to be:

	dev = rc_allocate_device();
	dev->x = a;
	dev->y = b;
	dev->z = c;
	rc_register_device();

which is a pretty common pattern in the kernel, after the introduction of
protocol arrays the API looks something like:

	dev = rc_allocate_device();
	dev->x = a;
	rc_set_allowed_protocols(dev, RC_BIT_X);
	dev->z = c;
	rc_register_device();

There's no real need for the protocols to be an array, so change it
back to be consistent (and in preparation for the following patches).

[m.chehab@samsung.com: added missing changes at some files]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

29 files changed, 61 insertions, 62 deletions

diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 8730b32a067c..2e1335306eb3 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -784,7 +784,7 @@ static void ati_remote_rc_init(struct ati_remote *ati_remote)
 
         rdev->priv = ati_remote;
         rdev->driver_type = RC_DRIVER_SCANCODE;
-        rc_set_allowed_protocols(rdev, RC_BIT_OTHER);
+        rdev->allowed_protocols = RC_BIT_OTHER;
         rdev->driver_name = "ati_remote";
 
         rdev->open = ati_remote_rc_open;
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index fc9d23f2ed3f..d16d9b496b92 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1059,7 +1059,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
                 learning_mode_force = false;
 
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         rdev->priv = dev;
         rdev->open = ene_open;
         rdev->close = ene_close;
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 46b66e59438f..f000faf7340b 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -541,7 +541,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* Set up the rc device */
         rdev->priv = fintek;
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         rdev->open = fintek_open;
         rdev->close = fintek_close;
         rdev->input_name = FINTEK_DESCRIPTION;
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 29b5f89813b4..59853085bc88 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -145,9 +145,9 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
         rcdev->dev.parent = &pdev->dev;
         rcdev->driver_name = GPIO_IR_DRIVER_NAME;
         if (pdata->allowed_protos)
-                rc_set_allowed_protocols(rcdev, pdata->allowed_protos);
+                rcdev->allowed_protocols = pdata->allowed_protos;
         else
-                rc_set_allowed_protocols(rcdev, RC_BIT_ALL);
+                rcdev->allowed_protocols = RC_BIT_ALL;
         rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
 
         gpio_dev->rcdev = rcdev;
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index 627ddfd61980..ee60e17fba05 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -495,7 +495,7 @@ static int iguanair_probe(struct usb_interface *intf,
         usb_to_input_id(ir->udev, &rc->input_id);
         rc->dev.parent = &intf->dev;
         rc->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rc, RC_BIT_ALL);
+        rc->allowed_protocols = RC_BIT_ALL;
         rc->priv = ir;
         rc->open = iguanair_open;
         rc->close = iguanair_close;
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c
index b0ec55f52228..bfb282a714e8 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.c
+++ b/drivers/media/rc/img-ir/img-ir-hw.c
@@ -556,8 +556,8 @@ static void img_ir_set_decoder(struct img_ir_priv *priv,
         hw->mode = IMG_IR_M_NORMAL;
 
         /* clear the wakeup scancode filter */
-        rdev->scancode_filters[RC_FILTER_WAKEUP].data = 0;
-        rdev->scancode_filters[RC_FILTER_WAKEUP].mask = 0;
+        rdev->scancode_wakeup_filter.data = 0;
+        rdev->scancode_wakeup_filter.mask = 0;
 
         /* clear raw filters */
         _img_ir_set_filter(priv, NULL);
@@ -661,8 +661,8 @@ success:
         wakeup_protocols = *ir_type;
         if (!hw->decoder || !hw->decoder->filter)
                 wakeup_protocols = 0;
-        rc_set_allowed_wakeup_protocols(rdev, wakeup_protocols);
-        rc_set_enabled_wakeup_protocols(rdev, wakeup_protocols);
+        rdev->allowed_wakeup_protocols = wakeup_protocols;
+        rdev->enabled_wakeup_protocols = wakeup_protocols;
         return 0;
 }
 
@@ -676,9 +676,9 @@ static void img_ir_set_protocol(struct img_ir_priv *priv, u64 proto)
         spin_unlock_irq(&rdev->rc_map.lock);
 
         mutex_lock(&rdev->lock);
-        rc_set_enabled_protocols(rdev, proto);
-        rc_set_allowed_wakeup_protocols(rdev, proto);
-        rc_set_enabled_wakeup_protocols(rdev, proto);
+        rdev->enabled_protocols = proto;
+        rdev->allowed_wakeup_protocols = proto;
+        rdev->enabled_wakeup_protocols = proto;
         mutex_unlock(&rdev->lock);
 }
 
@@ -1003,7 +1003,7 @@ int img_ir_probe_hw(struct img_ir_priv *priv)
         }
         rdev->priv = priv;
         rdev->map_name = RC_MAP_EMPTY;
-        rc_set_allowed_protocols(rdev, img_ir_allowed_protos(priv));
+        rdev->allowed_protocols = img_ir_allowed_protos(priv);
         rdev->input_name = "IMG Infrared Decoder";
         rdev->s_filter = img_ir_set_normal_filter;
         rdev->s_wakeup_filter = img_ir_set_wakeup_filter;
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index eb37f2622364..ac05c364f663 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1017,7 +1017,7 @@ 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_protocols_allowed(rc, *rc_type))
+        if (*rc_type && !(*rc_type & rc->allowed_protocols))
                 dev_warn(dev, "Looks like you're trying to use an IR protocol "
                          "this device does not support\n");
 
@@ -1870,8 +1870,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
 
         rdev->priv = ictx;
         rdev->driver_type = RC_DRIVER_SCANCODE;
-                                        /* iMON PAD or MCE */
-        rc_set_allowed_protocols(rdev, RC_BIT_OTHER | RC_BIT_RC6_MCE);
+        rdev->allowed_protocols = RC_BIT_OTHER | RC_BIT_RC6_MCE; /* iMON PAD or MCE */
         rdev->change_protocol = imon_ir_change_protocol;
         rdev->driver_name = MOD_NAME;
 
@@ -1884,7 +1883,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
 
         if (ictx->product == 0xffdc) {
                 imon_get_ffdc_type(ictx);
-                rc_set_allowed_protocols(rdev, ictx->rc_type);
+                rdev->allowed_protocols = ictx->rc_type;
         }
 
         imon_set_display_type(ictx);
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 7b79eca83449..30bcf188d377 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -47,7 +47,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
 {
         struct jvc_dec *data = &dev->raw->jvc;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_JVC))
+        if (!(dev->enabled_protocols & RC_BIT_JVC))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index d731da6c414d..ed2c8a1ed8ca 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -35,7 +35,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
         struct lirc_codec *lirc = &dev->raw->lirc;
         int sample;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_LIRC))
+        if (!(dev->enabled_protocols & RC_BIT_LIRC))
                 return 0;
 
         if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
index 0c55f794c8cf..9f3c9b59f30c 100644
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
@@ -216,7 +216,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u32 scancode;
         unsigned long delay;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_MCE_KBD))
+        if (!(dev->enabled_protocols & RC_BIT_MCE_KBD))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index c4333d5c0046..7b81fec0820f 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -52,7 +52,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u8 address, not_address, command, not_command;
         bool send_32bits = false;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_NEC))
+        if (!(dev->enabled_protocols & RC_BIT_NEC))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index c08718e17671..c72f57cebfd2 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -262,7 +262,7 @@ int ir_raw_event_register(struct rc_dev *dev)
                 return -ENOMEM;
 
         dev->raw->dev = dev;
-        rc_set_enabled_protocols(dev, ~0);
+        dev->enabled_protocols = ~0;
         dev->change_protocol = change_protocol;
         rc = kfifo_alloc(&dev->raw->kfifo,
                          sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index 3d38cbce5667..04ce42fa9eec 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -53,7 +53,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u32 scancode;
         enum rc_type protocol;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_RC5 | RC_BIT_RC5X))
+        if (!(dev->enabled_protocols & (RC_BIT_RC5 | RC_BIT_RC5X)))
                 return 0;
 
         if (!is_timing_event(ev)) {
@@ -129,7 +129,7 @@ again:
                 if (data->wanted_bits == RC5X_NBITS) {
                         /* RC5X */
                         u8 xdata, command, system;
-                        if (!rc_protocols_enabled(dev, RC_BIT_RC5X)) {
+                        if (!(dev->enabled_protocols & RC_BIT_RC5X)) {
                                 data->state = STATE_INACTIVE;
                                 return 0;
                         }
@@ -147,7 +147,7 @@ again:
                 } else {
                         /* RC5 */
                         u8 command, system;
-                        if (!rc_protocols_enabled(dev, RC_BIT_RC5)) {
+                        if (!(dev->enabled_protocols & RC_BIT_RC5)) {
                                 data->state = STATE_INACTIVE;
                                 return 0;
                         }
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 85c771112cf5..771e9fcbd770 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -48,7 +48,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u8 toggle, command, system;
         u32 scancode;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_RC5_SZ))
+        if (!(dev->enabled_protocols & RC_BIT_RC5_SZ))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index 1dc97a7b92a5..f1f098e22f7e 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -90,9 +90,9 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u8 toggle;
         enum rc_type protocol;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 |
-                                  RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 |
-                                  RC_BIT_RC6_MCE))
+        if (!(dev->enabled_protocols &
+              (RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 |
+               RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-sanyo-decoder.c b/drivers/media/rc/ir-sanyo-decoder.c
index 5f7702261d23..ad1dc6ae21fc 100644
--- a/drivers/media/rc/ir-sanyo-decoder.c
+++ b/drivers/media/rc/ir-sanyo-decoder.c
@@ -58,7 +58,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u32 scancode;
         u8 address, command, not_command;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_SANYO))
+        if (!(dev->enabled_protocols & RC_BIT_SANYO))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index c8f251939143..b7acdbae8159 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -48,7 +48,7 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
         struct sharp_dec *data = &dev->raw->sharp;
         u32 msg, echo, address, command, scancode;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_SHARP))
+        if (!(dev->enabled_protocols & RC_BIT_SHARP))
                 return 0;
 
         if (!is_timing_event(ev)) {
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index f485f9fe1e90..d12dc3da5931 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -46,8 +46,8 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
         u32 scancode;
         u8 device, subdevice, function;
 
-        if (!rc_protocols_enabled(dev, RC_BIT_SONY12 | RC_BIT_SONY15 |
-                                  RC_BIT_SONY20))
+        if (!(dev->enabled_protocols &
+              (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20)))
                 return 0;
 
         if (!is_timing_event(ev)) {
@@ -125,7 +125,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
 
                 switch (data->count) {
                 case 12:
-                        if (!rc_protocols_enabled(dev, RC_BIT_SONY12)) {
+                        if (!(dev->enabled_protocols & RC_BIT_SONY12)) {
                                 data->state = STATE_INACTIVE;
                                 return 0;
                         }
@@ -135,7 +135,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         protocol = RC_TYPE_SONY12;
                         break;
                 case 15:
-                        if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) {
+                        if (!(dev->enabled_protocols & RC_BIT_SONY15)) {
                                 data->state = STATE_INACTIVE;
                                 return 0;
                         }
@@ -145,7 +145,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         protocol = RC_TYPE_SONY15;
                         break;
                 case 20:
-                        if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) {
+                        if (!(dev->enabled_protocols & RC_BIT_SONY20)) {
                                 data->state = STATE_INACTIVE;
                                 return 0;
                         }
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index ab24cc6d3655..32fd5f4614c8 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1563,7 +1563,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* set up ir-core props */
         rdev->priv = itdev;
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         rdev->open = ite_open;
         rdev->close = ite_close;
         rdev->s_idle = ite_s_idle;
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index d5c1df3c9db1..b1be81fc6bd7 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1219,7 +1219,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
         rc->dev.parent = dev;
         rc->priv = ir;
         rc->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rc, RC_BIT_ALL);
+        rc->allowed_protocols = RC_BIT_ALL;
         rc->timeout = MS_TO_NS(100);
         if (!ir->flags.no_tx) {
                 rc->s_tx_mask = mceusb_set_tx_mask;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index d244e1a83f43..8c6008f81332 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1044,7 +1044,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         /* Set up the rc device */
         rdev->priv = nvt;
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         rdev->open = nvt_open;
         rdev->close = nvt_close;
         rdev->tx_ir = nvt_tx_ir;
diff --git a/drivers/media/rc/rc-loopback.c b/drivers/media/rc/rc-loopback.c
index 0a88e0cf964f..63dace8198b0 100644
--- a/drivers/media/rc/rc-loopback.c
+++ b/drivers/media/rc/rc-loopback.c
@@ -195,7 +195,7 @@ static int __init loop_init(void)
         rc->map_name            = RC_MAP_EMPTY;
         rc->priv                = &loopdev;
         rc->driver_type         = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rc, RC_BIT_ALL);
+        rc->allowed_protocols   = RC_BIT_ALL;
         rc->timeout             = 100 * 1000 * 1000; /* 100 ms */
         rc->min_timeout         = 1;
         rc->max_timeout         = UINT_MAX;
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index d5bfe6442459..c3fb8f8f192b 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -857,14 +857,14 @@ static ssize_t show_protocols(struct device *device,
         mutex_lock(&dev->lock);
 
         if (fattr->type == RC_FILTER_NORMAL) {
-                enabled = dev->enabled_protocols[RC_FILTER_NORMAL];
+                enabled = dev->enabled_protocols;
                 if (dev->raw)
                         allowed = ir_raw_get_allowed_protocols();
                 else
-                        allowed = dev->allowed_protocols[RC_FILTER_NORMAL];
+                        allowed = dev->allowed_protocols;
         } else {
-                enabled = dev->enabled_protocols[RC_FILTER_WAKEUP];
-                allowed = dev->allowed_protocols[RC_FILTER_WAKEUP];
+                enabled = dev->enabled_wakeup_protocols;
+                allowed = dev->allowed_wakeup_protocols;
         }
 
         mutex_unlock(&dev->lock);
@@ -989,15 +989,15 @@ static ssize_t store_protocols(struct device *device,
 
         if (fattr->type == RC_FILTER_NORMAL) {
                 IR_dprintk(1, "Normal protocol change requested\n");
-                current_protocols = &dev->enabled_protocols[RC_FILTER_NORMAL];
+                current_protocols = &dev->enabled_protocols;
                 change_protocol = dev->change_protocol;
-                filter = &dev->scancode_filters[RC_FILTER_NORMAL];
+                filter = &dev->scancode_filter;
                 set_filter = dev->s_filter;
         } else {
                 IR_dprintk(1, "Wakeup protocol change requested\n");
-                current_protocols = &dev->enabled_protocols[RC_FILTER_WAKEUP];
+                current_protocols = &dev->enabled_wakeup_protocols;
                 change_protocol = dev->change_wakeup_protocol;
-                filter = &dev->scancode_filters[RC_FILTER_WAKEUP];
+                filter = &dev->scancode_wakeup_filter;
                 set_filter = dev->s_wakeup_filter;
         }
 
@@ -1085,9 +1085,9 @@ static ssize_t show_filter(struct device *device,
                 return -EINVAL;
 
         if (fattr->type == RC_FILTER_NORMAL)
-                filter = &dev->scancode_filters[RC_FILTER_NORMAL];
+                filter = &dev->scancode_filter;
         else
-                filter = &dev->scancode_filters[RC_FILTER_WAKEUP];
+                filter = &dev->scancode_wakeup_filter;
 
         mutex_lock(&dev->lock);
         if (fattr->mask)
@@ -1140,12 +1140,12 @@ static ssize_t store_filter(struct device *device,
 
         if (fattr->type == RC_FILTER_NORMAL) {
                 set_filter = dev->s_filter;
-                enabled_protocols = &dev->enabled_protocols[RC_FILTER_NORMAL];
-                filter = &dev->scancode_filters[RC_FILTER_NORMAL];
+                enabled_protocols = &dev->enabled_protocols;
+                filter = &dev->scancode_filter;
         } else {
                 set_filter = dev->s_wakeup_filter;
-                enabled_protocols = &dev->enabled_protocols[RC_FILTER_WAKEUP];
-                filter = &dev->scancode_filters[RC_FILTER_WAKEUP];
+                enabled_protocols = &dev->enabled_wakeup_protocols;
+                filter = &dev->scancode_wakeup_filter;
         }
 
         if (!set_filter)
@@ -1424,7 +1424,7 @@ int rc_register_device(struct rc_dev *dev)
                 rc = dev->change_protocol(dev, &rc_type);
                 if (rc < 0)
                         goto out_raw;
-                dev->enabled_protocols[RC_FILTER_NORMAL] = rc_type;
+                dev->enabled_protocols = rc_type;
         }
 
         mutex_unlock(&dev->lock);
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 79abbc8d9600..795b394a5d84 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -878,7 +878,7 @@ static struct rc_dev *redrat3_init_rc_dev(struct redrat3_dev *rr3)
         rc->dev.parent = dev;
         rc->priv = rr3;
         rc->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rc, RC_BIT_ALL);
+        rc->allowed_protocols = RC_BIT_ALL;
         rc->timeout = US_TO_NS(2750);
         rc->tx_ir = redrat3_transmit_ir;
         rc->s_tx_carrier = redrat3_set_tx_carrier;
diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c
index 22e4c1f28ab4..5c151351afa4 100644
--- a/drivers/media/rc/st_rc.c
+++ b/drivers/media/rc/st_rc.c
@@ -287,7 +287,7 @@ static int st_rc_probe(struct platform_device *pdev)
         st_rc_hardware_init(rc_dev);
 
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         /* rx sampling rate is 10Mhz */
         rdev->rx_resolution = 100;
         rdev->timeout = US_TO_NS(MAX_SYMB_TIME);
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index bd5e4ff9e0ba..828bbb886882 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -316,7 +316,7 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
         rdev->dev.parent = dev;
         rdev->priv = sz;
         rdev->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+        rdev->allowed_protocols = RC_BIT_ALL;
         rdev->driver_name = DRIVER_NAME;
         rdev->map_name = RC_MAP_STREAMZAP;
 
diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
index 13dcd800eb41..bcee8e1a4e9e 100644
--- a/drivers/media/rc/sunxi-cir.c
+++ b/drivers/media/rc/sunxi-cir.c
@@ -210,7 +210,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)
         ir->rc->map_name = ir->map_name ?: RC_MAP_EMPTY;
         ir->rc->dev.parent = dev;
         ir->rc->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(ir->rc, RC_BIT_ALL);
+        ir->rc->allowed_protocols = RC_BIT_ALL;
         ir->rc->rx_resolution = SUNXI_IR_SAMPLE;
         ir->rc->timeout = MS_TO_NS(SUNXI_IR_TIMEOUT);
         ir->rc->driver_name = SUNXI_IR_DEV;
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index c5be38e2a2fe..bc214e2b3a36 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -318,7 +318,7 @@ static int ttusbir_probe(struct usb_interface *intf,
         usb_to_input_id(tt->udev, &rc->input_id);
         rc->dev.parent = &intf->dev;
         rc->driver_type = RC_DRIVER_IR_RAW;
-        rc_set_allowed_protocols(rc, RC_BIT_ALL);
+        rc->allowed_protocols = RC_BIT_ALL;
         rc->priv = tt;
         rc->driver_name = DRIVER_NAME;
         rc->map_name = RC_MAP_TT_1500;
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index a8b981f5ce2e..d839f73f6a05 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1082,7 +1082,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
         data->dev->dev.parent = &device->dev;
         data->dev->timeout = MS_TO_NS(100);
         data->dev->rx_resolution = US_TO_NS(2);
-        rc_set_allowed_protocols(data->dev, RC_BIT_ALL);
+        data->dev->allowed_protocols = RC_BIT_ALL;
 
         err = rc_register_device(data->dev);
         if (err)