rc-core fixes

index a867bf9e8416..f8cc7e4a3d95 100644
@@ -8,7 +8,6 @@
 #include <media/rc-core.h>
 #include <linux/bsearch.h>
 #include <linux/spinlock.h>
-#include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/slab.h>

@@ -114,8 +113,6 @@ struct rc_map *rc_map_get(const char *name)
 			pr_err("Couldn't load IR keymap %s\n", name);
 			return NULL;
 		}
-		msleep(20);	/* Give some time for IR to register */
-
 		map = seek_rc_map(name);
 	}
 #endif

@@ -1278,7 +1275,6 @@ void ir_raw_load_modules(u64 *protocols)
 			*protocols &= ~proto_names[i].type;
 			continue;
 		}
-		msleep(20);
 		available = ir_raw_get_allowed_protocols();
 		if (!(*protocols & proto_names[i].type & ~available))
 			continue;

index 75dee4a483d4..a79fc89f0dc4 100644
@@ -101,7 +101,8 @@ int ir_raw_event_store_edge(struct rc_dev *dev, bool pulse)
 	struct ir_raw_event	ev = {};
 
 	now = ktime_get();
-	ev.duration = ktime_to_us(ktime_sub(now, dev->raw->last_event));
+	ev.duration = min_t(u64, U32_MAX,
+			    ktime_to_us(ktime_sub(now, dev->raw->last_event)));
 	ev.pulse = !pulse;
 
 	return ir_raw_event_store_with_timeout(dev, &ev);

index f8cc7e4a3d95..c36a62992b76 100644
@@ -2071,10 +2071,12 @@ void rc_unregister_device(struct rc_dev *dev)
 	if (dev->driver_type == RC_DRIVER_IR_RAW)
 		ir_raw_event_unregister(dev);
 
-	timer_delete_sync(&dev->timer_keyup);
-	timer_delete_sync(&dev->timer_repeat);
+	if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
+		timer_delete_sync(&dev->timer_keyup);
+		timer_delete_sync(&dev->timer_repeat);
 
-	rc_free_rx_device(dev);
+		rc_free_rx_device(dev);
+	}
 
 	/*
 	 * lirc device should be freed with dev->registered = false, so

index 0a8844cce23b..56958576a13f 100644
@@ -13,8 +13,6 @@
  *   support for me and provided debug dumps from their devices.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
-
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>

@@ -462,10 +460,6 @@ MODULE_VERSION(MOD_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
 
-static bool debug;
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes (default: no)");
-
 /* lcd, vfd, vga or none? should be auto-detected, but can be overridden... */
 static int display_type;
 module_param(display_type, int, S_IRUGO);

@@ -513,7 +507,6 @@ static int display_open(struct inode *inode, struct file *file)
 	subminor = iminor(inode);
 	interface = usb_find_interface(&imon_driver, subminor);
 	if (!interface) {
-		pr_err("could not find interface for minor %d\n", subminor);
 		retval = -ENODEV;
 		goto exit;
 	}

@@ -522,7 +515,8 @@ static int display_open(struct inode *inode, struct file *file)
 	ictx = usb_get_intfdata(interface);
 	if (!ictx || ictx->disconnected || !refcount_inc_not_zero(&ictx->users)) {
 		rcu_read_unlock();
-		pr_err("no context found for minor %d\n", subminor);
+		dev_dbg(&interface->dev, "no context found for minor %d\n",
+			subminor);
 		retval = -ENODEV;
 		goto exit;
 	}

@@ -533,10 +527,10 @@ static int display_open(struct inode *inode, struct file *file)
 	if (ictx->disconnected) {
 		retval = -ENODEV;
 	} else if (!ictx->display_supported) {
-		pr_err("display not supported by device\n");
+		dev_dbg(ictx->dev, "display not supported by device\n");
 		retval = -ENODEV;
 	} else if (ictx->display_isopen) {
-		pr_err("display port is already open\n");
+		dev_dbg(ictx->dev, "display port is already open\n");
 		retval = -EBUSY;
 	} else {
 		ictx->display_isopen = true;

@@ -565,10 +559,10 @@ static int display_close(struct inode *inode, struct file *file)
 	mutex_lock(&ictx->lock);
 
 	if (!ictx->display_supported) {
-		pr_err("display not supported by device\n");
+		dev_err(ictx->dev, "display not supported by device\n");
 		retval = -ENODEV;
 	} else if (!ictx->display_isopen) {
-		pr_err("display is not open\n");
+		dev_err(ictx->dev, "display is not open\n");
 		retval = -EIO;
 	} else {
 		ictx->display_isopen = false;

@@ -643,13 +637,13 @@ static int send_packet(struct imon_context *ictx)
 	if (retval) {
 		ictx->tx.busy = false;
 		smp_rmb(); /* ensure later readers know we're not busy */
-		pr_err_ratelimited("error submitting urb(%d)\n", retval);
+		dev_err_ratelimited(ictx->dev, "error submitting urb(%d)\n", retval);
 	} else {
 		/* Wait for transmission to complete (or abort or timeout) */
 		retval = wait_for_completion_interruptible_timeout(&ictx->tx.finished, 10 * HZ);
 		if (retval <= 0) {
 			usb_kill_urb(ictx->tx_urb);
-			pr_err_ratelimited("task interrupted\n");
+			dev_dbg(ictx->dev, "task interrupted\n");
 			if (retval < 0)
 				ictx->tx.status = retval;
 			else

@@ -659,7 +653,8 @@ static int send_packet(struct imon_context *ictx)
 		ictx->tx.busy = false;
 		retval = ictx->tx.status;
 		if (retval)
-			pr_err_ratelimited("packet tx failed (%d)\n", retval);
+			dev_err_ratelimited(ictx->dev, "packet tx failed (%d)\n",
+					    retval);
 	}
 
 	kfree(control_req);

@@ -689,13 +684,8 @@ static int send_associate_24g(struct imon_context *ictx)
 	const unsigned char packet[8] = { 0x01, 0x00, 0x00, 0x00,
 					  0x00, 0x00, 0x00, 0x20 };
 
-	if (!ictx) {
-		pr_err("no context for device\n");
-		return -ENODEV;
-	}
-
 	if (!ictx->dev_present_intf0) {
-		pr_err("no iMON device present\n");
+		dev_dbg(ictx->dev, "no iMON device present\n");
 		return -ENODEV;
 	}
 

@@ -721,11 +711,6 @@ static int send_set_imon_clock(struct imon_context *ictx,
 	int retval = 0;
 	int i;
 
-	if (!ictx) {
-		pr_err("no context for device\n");
-		return -ENODEV;
-	}
-
 	switch (ictx->display_type) {
 	case IMON_DISPLAY_TYPE_LCD:
 		clock_enable_pkt[0][0] = 0x80;

@@ -783,7 +768,7 @@ static int send_set_imon_clock(struct imon_context *ictx,
 		memcpy(ictx->usb_tx_buf, clock_enable_pkt[i], 8);
 		retval = send_packet(ictx);
 		if (retval) {
-			pr_err("send_packet failed for packet %d\n", i);
+			dev_err(ictx->dev, "send_packet failed for packet %d\n", i);
 			break;
 		}
 	}

@@ -958,13 +943,13 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
 	}
 
 	if (!ictx->dev_present_intf0) {
-		pr_err_ratelimited("no iMON device present\n");
+		dev_dbg(ictx->dev, "no iMON device present\n");
 		retval = -ENODEV;
 		goto exit;
 	}
 
 	if (n_bytes <= 0 || n_bytes > 32) {
-		pr_err_ratelimited("invalid payload size\n");
+		dev_dbg(ictx->dev, "invalid payload size\n");
 		retval = -EINVAL;
 		goto exit;
 	}

@@ -990,7 +975,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
 
 		retval = send_packet(ictx);
 		if (retval) {
-			pr_err_ratelimited("send packet #%d failed\n", seq / 2);
+			dev_err_ratelimited(ictx->dev, "send packet #%d failed\n",
+					    seq / 2);
 			goto exit;
 		} else {
 			seq += 2;

@@ -1004,7 +990,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
 	ictx->usb_tx_buf[7] = (unsigned char) seq;
 	retval = send_packet(ictx);
 	if (retval)
-		pr_err_ratelimited("send packet #%d failed\n", seq / 2);
+		dev_err_ratelimited(ictx->dev, "send packet #%d failed\n",
+				    seq / 2);
 
 exit:
 	mutex_unlock(&ictx->lock);

@@ -1039,14 +1026,14 @@ static ssize_t lcd_write(struct file *file, const char __user *buf,
 	}
 
 	if (!ictx->display_supported) {
-		pr_err_ratelimited("no iMON display present\n");
+		dev_dbg(ictx->dev, "no iMON display present\n");
 		retval = -ENODEV;
 		goto exit;
 	}
 
 	if (n_bytes != 8) {
-		pr_err_ratelimited("invalid payload size: %d (expected 8)\n",
-				   (int)n_bytes);
+		dev_dbg(ictx->dev, "invalid payload size: %zu (expected 8)\n",
+			n_bytes);
 		retval = -EINVAL;
 		goto exit;
 	}

@@ -1058,7 +1045,7 @@ static ssize_t lcd_write(struct file *file, const char __user *buf,
 
 	retval = send_packet(ictx);
 	if (retval) {
-		pr_err_ratelimited("send packet failed!\n");
+		dev_err_ratelimited(ictx->dev, "send packet failed!\n");
 		goto exit;
 	} else {
 		dev_dbg(ictx->dev, "%s: write %d bytes to LCD\n",

@@ -1647,10 +1634,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
 		imon_pad_to_keys(ictx, buf);
 	}
 
-	if (debug) {
-		printk(KERN_INFO "intf%d decoded packet: %*ph\n",
-		       intf, len, buf);
-	}
+	dev_dbg(dev, "intf%d decoded packet: %*ph\n", intf, len, buf);
 
 	press_type = imon_parse_press_type(ictx, buf, ktype);
 	if (press_type < 0)

@@ -1841,65 +1825,66 @@ 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_PROTO_BIT_IMON;
+	const char *descr;
 
 	switch (ffdc_cfg_byte) {
 	/* iMON Knob, no display, iMON IR + vol knob */
 	case 0x21:
-		dev_info(ictx->dev, "0xffdc iMON Knob, iMON IR");
+		descr = "0xffdc iMON Knob, iMON IR";
 		ictx->display_supported = false;
 		break;
 	/* iMON 2.4G LT (usb stick), no display, iMON RF */
 	case 0x4e:
-		dev_info(ictx->dev, "0xffdc iMON 2.4G LT, iMON RF");
+		descr = "0xffdc iMON 2.4G LT, iMON RF";
 		ictx->display_supported = false;
 		ictx->rf_device = true;
 		break;
 	/* iMON VFD, no IR (does have vol knob tho) */
 	case 0x35:
-		dev_info(ictx->dev, "0xffdc iMON VFD + knob, no IR");
+		descr = "0xffdc iMON VFD + knob, no IR";
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		break;
 	/* iMON VFD, iMON IR */
 	case 0x24:
 	case 0x30:
 	case 0x85:
-		dev_info(ictx->dev, "0xffdc iMON VFD, iMON IR");
+		descr = "0xffdc iMON VFD, iMON IR";
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		break;
 	/* iMON VFD, MCE IR */
 	case 0x46:
 	case 0x9e:
-		dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
+		descr = "0xffdc iMON VFD, MCE IR";
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		allowed_protos = RC_PROTO_BIT_RC6_MCE;
 		break;
 	/* iMON VFD, iMON or MCE IR */
 	case 0x7e:
-		dev_info(ictx->dev, "0xffdc iMON VFD, iMON or MCE IR");
+		descr = "0xffdc iMON VFD, iMON or MCE IR";
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		allowed_protos |= RC_PROTO_BIT_RC6_MCE;
 		break;
 	/* iMON LCD, MCE IR */
 	case 0x9f:
-		dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
+		descr = "0xffdc iMON LCD, MCE IR";
 		detected_display_type = IMON_DISPLAY_TYPE_LCD;
 		allowed_protos = RC_PROTO_BIT_RC6_MCE;
 		break;
 	/* no display, iMON IR */
 	case 0x26:
-		dev_info(ictx->dev, "0xffdc iMON Inside, iMON IR");
+		descr = "0xffdc iMON Inside, iMON IR";
 		ictx->display_supported = false;
 		break;
 	/* Soundgraph iMON UltraBay */
 	case 0x98:
-		dev_info(ictx->dev, "0xffdc iMON UltraBay, LCD + IR");
+		descr = "0xffdc iMON UltraBay, LCD + IR";
 		detected_display_type = IMON_DISPLAY_TYPE_LCD;
 		allowed_protos = RC_PROTO_BIT_IMON | RC_PROTO_BIT_RC6_MCE;
 		ictx->dev_descr = &ultrabay_table;
 		break;
 
 	default:
-		dev_info(ictx->dev, "Unknown 0xffdc device, defaulting to VFD and iMON IR");
+		descr = "Unknown 0xffdc device, defaulting to VFD and iMON IR";
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		/*
 		 * We don't know which one it is, allow user to set the

@@ -1909,7 +1894,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 		break;
 	}
 
-	printk(KERN_CONT " (id 0x%02x)\n", ffdc_cfg_byte);
+	dev_info(ictx->dev, "%s (id 0x%02x)\n", descr, ffdc_cfg_byte);
 
 	ictx->display_type = detected_display_type;
 	ictx->rc_proto = allowed_protos;

@@ -2207,7 +2192,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 
 	/* Input endpoint is mandatory */
 	if (!ir_ep_found)
-		pr_err("no valid input (IR) endpoint found\n");
+		dev_err(ictx->dev, "no valid input (IR) endpoint found\n");
 
 	ictx->tx_control = tx_control;
 

@@ -2276,7 +2261,7 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf,
 
 	ret = usb_submit_urb(ictx->rx_urb_intf0, GFP_KERNEL);
 	if (ret) {
-		pr_err("usb_submit_urb failed for intf0 (%d)\n", ret);
+		dev_err(dev, "usb_submit_urb failed for intf0 (%d)\n", ret);
 		goto urb_submit_failed;
 	}
 

@@ -2452,8 +2437,8 @@ static int imon_probe(struct usb_interface *interface,
 		sysfs_err = sysfs_create_group(&interface->dev.kobj,
 					       &imon_rf_attr_group);
 		if (sysfs_err)
-			pr_err("Could not create RF sysfs entries(%d)\n",
-			       sysfs_err);
+			dev_err(dev, "Could not create RF sysfs entries(%d)\n",
+				sysfs_err);
 	}
 
 	if (ictx->display_supported)

index e24946c8fe20..8d85474f9866 100644
@@ -62,7 +62,7 @@ static struct rc_map_table adstech_dvb_t_pci[] = {
 static struct rc_map_list adstech_dvb_t_pci_map = {
 	.map = {
 		.scan     = adstech_dvb_t_pci,
-		.size     = ARRAY_SIZE(adstech_dvb_t_pci),
+		.entries  = ARRAY_SIZE(adstech_dvb_t_pci),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_ADSTECH_DVB_T_PCI,
 	}

index 9926259b43ee..f289184034a7 100644
@@ -33,7 +33,7 @@ static struct rc_map_table alink_dtu_m[] = {
 static struct rc_map_list alink_dtu_m_map = {
 	.map = {
 		.scan     = alink_dtu_m,
-		.size     = ARRAY_SIZE(alink_dtu_m),
+		.entries  = ARRAY_SIZE(alink_dtu_m),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_ALINK_DTU_M,
 	}

index e4bcbf889fed..c8b878ad71da 100644
@@ -58,7 +58,7 @@ static struct rc_map_table anysee[] = {
 static struct rc_map_list anysee_map = {
 	.map = {
 		.scan     = anysee,
-		.size     = ARRAY_SIZE(anysee),
+		.entries  = ARRAY_SIZE(anysee),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_ANYSEE,
 	}

index 80b096f02e99..ba1142f54e86 100644
@@ -53,7 +53,7 @@ static struct rc_map_table apac_viewcomp[] = {
 static struct rc_map_list apac_viewcomp_map = {
 	.map = {
 		.scan     = apac_viewcomp,
-		.size     = ARRAY_SIZE(apac_viewcomp),
+		.entries  = ARRAY_SIZE(apac_viewcomp),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_APAC_VIEWCOMP,
 	}

index 212b0d920901..4b82a5718be8 100644
@@ -41,7 +41,7 @@ static struct rc_map_table t2hybrid[] = {
 static struct rc_map_list t2hybrid_map = {
 	.map = {
 		.scan     = t2hybrid,
-		.size     = ARRAY_SIZE(t2hybrid),
+		.entries  = ARRAY_SIZE(t2hybrid),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_ASTROMETA_T2HYBRID,
 	}

index bd55b7c6f82a..0b433de53c48 100644
@@ -64,7 +64,7 @@ static struct rc_map_table asus_pc39[] = {
 static struct rc_map_list asus_pc39_map = {
 	.map = {
 		.scan     = asus_pc39,
-		.size     = ARRAY_SIZE(asus_pc39),
+		.entries  = ARRAY_SIZE(asus_pc39),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_ASUS_PC39,
 	}

index 9d63c1e4a17a..2541013a96aa 100644
@@ -63,7 +63,7 @@ static struct rc_map_table asus_ps3_100[] = {
 static struct rc_map_list asus_ps3_100_map = {
 .map = {
 	.scan     = asus_ps3_100,
-	.size     = ARRAY_SIZE(asus_ps3_100),
+	.entries  = ARRAY_SIZE(asus_ps3_100),
 	.rc_proto = RC_PROTO_RC5,
 	.name     = RC_MAP_ASUS_PS3_100,
 }

index 063237f0d2e2..694ac6aedde8 100644
@@ -42,7 +42,7 @@ static struct rc_map_table ati_tv_wonder_hd_600[] = {
 static struct rc_map_list ati_tv_wonder_hd_600_map = {
 	.map = {
 		.scan     = ati_tv_wonder_hd_600,
-		.size     = ARRAY_SIZE(ati_tv_wonder_hd_600),
+		.entries  = ARRAY_SIZE(ati_tv_wonder_hd_600),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_ATI_TV_WONDER_HD_600,
 	}

index 9f7cbe9a1ac8..812df1a3b458 100644
@@ -102,7 +102,7 @@ static struct rc_map_table ati_x10[] = {
 static struct rc_map_list ati_x10_map = {
 	.map = {
 		.scan     = ati_x10,
-		.size     = ARRAY_SIZE(ati_x10),
+		.entries  = ARRAY_SIZE(ati_x10),
 		.rc_proto = RC_PROTO_OTHER,
 		.name     = RC_MAP_ATI_X10,
 	}

index 98497f4f6f92..78e058231215 100644
@@ -48,7 +48,7 @@ static struct rc_map_table avermedia_a16d[] = {
 static struct rc_map_list avermedia_a16d_map = {
 	.map = {
 		.scan     = avermedia_a16d,
-		.size     = ARRAY_SIZE(avermedia_a16d),
+		.entries  = ARRAY_SIZE(avermedia_a16d),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_AVERMEDIA_A16D,
 	}

index 5832c2f8ab3f..f7dc7829d552 100644
@@ -70,7 +70,7 @@ static struct rc_map_table avermedia_cardbus[] = {
 static struct rc_map_list avermedia_cardbus_map = {
 	.map = {
 		.scan     = avermedia_cardbus,
-		.size     = ARRAY_SIZE(avermedia_cardbus),
+		.entries  = ARRAY_SIZE(avermedia_cardbus),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_AVERMEDIA_CARDBUS,
 	}

index 3157d0c1cee9..8b5d94294d75 100644
@@ -51,7 +51,7 @@ static struct rc_map_table avermedia_dvbt[] = {
 static struct rc_map_list avermedia_dvbt_map = {
 	.map = {
 		.scan     = avermedia_dvbt,
-		.size     = ARRAY_SIZE(avermedia_dvbt),
+		.entries  = ARRAY_SIZE(avermedia_dvbt),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_AVERMEDIA_DVBT,
 	}

index cc1318ad09d9..d008d0fd94ba 100644
@@ -121,7 +121,7 @@ static struct rc_map_table avermedia_m135a[] = {
 static struct rc_map_list avermedia_m135a_map = {
 	.map = {
 		.scan     = avermedia_m135a,
-		.size     = ARRAY_SIZE(avermedia_m135a),
+		.entries  = ARRAY_SIZE(avermedia_m135a),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_AVERMEDIA_M135A,
 	}

index ec6c866c9f5d..2d637d41bf11 100644
@@ -69,7 +69,7 @@ static struct rc_map_table avermedia_m733a_rm_k6[] = {
 static struct rc_map_list avermedia_m733a_rm_k6_map = {
 	.map = {
 		.scan     = avermedia_m733a_rm_k6,
-		.size     = ARRAY_SIZE(avermedia_m733a_rm_k6),
+		.entries  = ARRAY_SIZE(avermedia_m733a_rm_k6),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_AVERMEDIA_M733A_RM_K6,
 	}

index ee4fe5791add..d1f8ef394bdd 100644
@@ -44,7 +44,7 @@ static struct rc_map_table avermedia_rm_ks[] = {
 static struct rc_map_list avermedia_rm_ks_map = {
 	.map = {
 		.scan     = avermedia_rm_ks,
-		.size     = ARRAY_SIZE(avermedia_rm_ks),
+		.entries  = ARRAY_SIZE(avermedia_rm_ks),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_AVERMEDIA_RM_KS,
 	}

index b827536a1f5f..bd3c2a1df334 100644
@@ -59,7 +59,7 @@ static struct rc_map_table avermedia[] = {
 static struct rc_map_list avermedia_map = {
 	.map = {
 		.scan     = avermedia,
-		.size     = ARRAY_SIZE(avermedia),
+		.entries  = ARRAY_SIZE(avermedia),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_AVERMEDIA,
 	}

index 71d1da42528d..79dfa22000a1 100644
@@ -58,7 +58,7 @@ static struct rc_map_table avertv_303[] = {
 static struct rc_map_list avertv_303_map = {
 	.map = {
 		.scan     = avertv_303,
-		.size     = ARRAY_SIZE(avertv_303),
+		.entries  = ARRAY_SIZE(avertv_303),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_AVERTV_303,
 	}

index 56f8eb1f0d01..ac0cb8d49e28 100644
@@ -67,7 +67,7 @@ static struct rc_map_table azurewave_ad_tu700[] = {
 static struct rc_map_list azurewave_ad_tu700_map = {
 	.map = {
 		.scan     = azurewave_ad_tu700,
-		.size     = ARRAY_SIZE(azurewave_ad_tu700),
+		.entries  = ARRAY_SIZE(azurewave_ad_tu700),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_AZUREWAVE_AD_TU700,
 	}

index 6e767d88c707..0dee07289991 100644
@@ -61,7 +61,7 @@ static struct rc_map_table beelink_gs1_table[] = {
 static struct rc_map_list beelink_gs1_map = {
 	.map = {
 		.scan     = beelink_gs1_table,
-		.size     = ARRAY_SIZE(beelink_gs1_table),
+		.entries  = ARRAY_SIZE(beelink_gs1_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_BEELINK_GS1,
 	}

index 88fad9959a86..67aa4881b6e0 100644
@@ -34,7 +34,7 @@ static struct rc_map_table beelink_mxiii[] = {
 static struct rc_map_list beelink_mxiii_map = {
 	.map = {
 		.scan     = beelink_mxiii,
-		.size     = ARRAY_SIZE(beelink_mxiii),
+		.entries  = ARRAY_SIZE(beelink_mxiii),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_BEELINK_MXIII,
 	}

index 6bdc924ac3cf..f3929d61e34a 100644
@@ -81,7 +81,7 @@ static struct rc_map_table behold_columbus[] = {
 static struct rc_map_list behold_columbus_map = {
 	.map = {
 		.scan     = behold_columbus,
-		.size     = ARRAY_SIZE(behold_columbus),
+		.entries  = ARRAY_SIZE(behold_columbus),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_BEHOLD_COLUMBUS,
 	}

index 0251ce835f79..6ecdcdab4e78 100644
@@ -114,7 +114,7 @@ static struct rc_map_table behold[] = {
 static struct rc_map_list behold_map = {
 	.map = {
 		.scan     = behold,
-		.size     = ARRAY_SIZE(behold),
+		.entries  = ARRAY_SIZE(behold),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_BEHOLD,
 	}

index 8fda5d1e140b..9fba5b085deb 100644
@@ -66,7 +66,7 @@ static struct rc_map_table budget_ci_old[] = {
 static struct rc_map_list budget_ci_old_map = {
 	.map = {
 		.scan     = budget_ci_old,
-		.size     = ARRAY_SIZE(budget_ci_old),
+		.entries  = ARRAY_SIZE(budget_ci_old),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_BUDGET_CI_OLD,
 	}

index 068e22aeac8c..c566383bb960 100644
@@ -165,7 +165,7 @@ static struct rc_map_table cec[] = {
 struct rc_map_list cec_map = {
 	.map = {
 		.scan		= cec,
-		.size		= ARRAY_SIZE(cec),
+		.entries	= ARRAY_SIZE(cec),
 		.rc_proto	= RC_PROTO_CEC,
 		.name		= RC_MAP_CEC,
 	}

index 092c3533d712..61ef7d780b3e 100644
@@ -57,7 +57,7 @@ static struct rc_map_table cinergy_1400[] = {
 static struct rc_map_list cinergy_1400_map = {
 	.map = {
 		.scan     = cinergy_1400,
-		.size     = ARRAY_SIZE(cinergy_1400),
+		.entries  = ARRAY_SIZE(cinergy_1400),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_CINERGY_1400,
 	}

index 334a290a3b91..1f4ebe8bb187 100644
@@ -51,7 +51,7 @@ static struct rc_map_table cinergy[] = {
 static struct rc_map_list cinergy_map = {
 	.map = {
 		.scan     = cinergy,
-		.size     = ARRAY_SIZE(cinergy),
+		.entries  = ARRAY_SIZE(cinergy),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_CINERGY,
 	}

index d4638df37c53..9334023150a4 100644
@@ -63,7 +63,7 @@ static struct rc_map_table ct_90405[] = {
 static struct rc_map_list ct_90405_map = {
 	.map = {
 		.scan     = ct_90405,
-		.size     = ARRAY_SIZE(ct_90405),
+		.entries  = ARRAY_SIZE(ct_90405),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_CT_90405,
 	}

index 7870d36f2c69..bfcd795047c5 100644
@@ -49,7 +49,7 @@ static struct rc_map_table rc_map_d680_dmb_table[] = {
 static struct rc_map_list d680_dmb_map = {
 	.map = {
 		.scan     = rc_map_d680_dmb_table,
-		.size     = ARRAY_SIZE(rc_map_d680_dmb_table),
+		.entries  = ARRAY_SIZE(rc_map_d680_dmb_table),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_D680_DMB,
 	}

index 529435e8d416..bae63f6f3f4d 100644
@@ -55,7 +55,7 @@ static struct rc_map_table delock_61959[] = {
 static struct rc_map_list delock_61959_map = {
 	.map = {
 		.scan     = delock_61959,
-		.size     = ARRAY_SIZE(delock_61959),
+		.entries  = ARRAY_SIZE(delock_61959),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_DELOCK_61959,
 	}

index 0323049fd2b1..76440b02f9ec 100644
@@ -97,7 +97,7 @@ static struct rc_map_table dib0700_nec_table[] = {
 static struct rc_map_list dib0700_nec_map = {
 	.map = {
 		.scan     = dib0700_nec_table,
-		.size     = ARRAY_SIZE(dib0700_nec_table),
+		.entries  = ARRAY_SIZE(dib0700_nec_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DIB0700_NEC_TABLE,
 	}

index d34e92eb92be..0536ee7bbf17 100644
@@ -208,7 +208,7 @@ static struct rc_map_table dib0700_rc5_table[] = {
 static struct rc_map_list dib0700_rc5_map = {
 	.map = {
 		.scan     = dib0700_rc5_table,
-		.size     = ARRAY_SIZE(dib0700_rc5_table),
+		.entries  = ARRAY_SIZE(dib0700_rc5_table),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_DIB0700_RC5_TABLE,
 	}

index d18b8f93a018..54eda79cc438 100644
@@ -63,7 +63,7 @@ static struct rc_map_table digitalnow_tinytwin[] = {
 static struct rc_map_list digitalnow_tinytwin_map = {
 	.map = {
 		.scan     = digitalnow_tinytwin,
-		.size     = ARRAY_SIZE(digitalnow_tinytwin),
+		.entries  = ARRAY_SIZE(digitalnow_tinytwin),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DIGITALNOW_TINYTWIN,
 	}

index 129a81f59b4a..a2342fe1771d 100644
@@ -47,7 +47,7 @@ static struct rc_map_table digittrade[] = {
 static struct rc_map_list digittrade_map = {
 	.map = {
 		.scan     = digittrade,
-		.size     = ARRAY_SIZE(digittrade),
+		.entries  = ARRAY_SIZE(digittrade),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DIGITTRADE,
 	}

index b82290ce925b..fd422670347e 100644
@@ -49,7 +49,7 @@ static struct rc_map_table dm1105_nec[] = {
 static struct rc_map_list dm1105_nec_map = {
 	.map = {
 		.scan     = dm1105_nec,
-		.size     = ARRAY_SIZE(dm1105_nec),
+		.entries  = ARRAY_SIZE(dm1105_nec),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_DM1105_NEC,
 	}

index 4b23335615cf..1bfe5a4403b2 100644
@@ -51,7 +51,7 @@ static struct rc_map_table dntv_live_dvb_t[] = {
 static struct rc_map_list dntv_live_dvb_t_map = {
 	.map = {
 		.scan     = dntv_live_dvb_t,
-		.size     = ARRAY_SIZE(dntv_live_dvb_t),
+		.entries  = ARRAY_SIZE(dntv_live_dvb_t),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_DNTV_LIVE_DVB_T,
 	}

index 46d8ea1b49a3..c0aeffa8a511 100644
@@ -70,7 +70,7 @@ static struct rc_map_table dntv_live_dvbt_pro[] = {
 static struct rc_map_list dntv_live_dvbt_pro_map = {
 	.map = {
 		.scan     = dntv_live_dvbt_pro,
-		.size     = ARRAY_SIZE(dntv_live_dvbt_pro),
+		.entries  = ARRAY_SIZE(dntv_live_dvbt_pro),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_DNTV_LIVE_DVBT_PRO,
 	}

index e1ec99ce3105..bc5a0d7d3bb2 100644
@@ -128,7 +128,7 @@ static struct rc_map_table dreambox[] = {
 static struct rc_map_list dreambox_map = {
 	.map = {
 		.scan     = dreambox,
-		.size     = ARRAY_SIZE(dreambox),
+		.entries  = ARRAY_SIZE(dreambox),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DREAMBOX,
 	}

index eeb2f6e303d7..7a95da357a56 100644
@@ -32,7 +32,7 @@ static struct rc_map_table dtt200u_table[] = {
 static struct rc_map_list dtt200u_map = {
 	.map = {
 		.scan     = dtt200u_table,
-		.size     = ARRAY_SIZE(dtt200u_table),
+		.entries  = ARRAY_SIZE(dtt200u_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DTT200U,
 	}

index 1fcd47bd8595..7e75abf59f7a 100644
@@ -50,7 +50,7 @@ static struct rc_map_table rc5_dvbsky[] = {
 static struct rc_map_list rc5_dvbsky_map = {
 	.map = {
 		.scan     = rc5_dvbsky,
-		.size     = ARRAY_SIZE(rc5_dvbsky),
+		.entries  = ARRAY_SIZE(rc5_dvbsky),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_DVBSKY,
 	}

index 4bb4222d259e..3d9043e7fbf5 100644
@@ -59,7 +59,7 @@ static struct rc_map_table rc_map_dvico_mce_table[] = {
 static struct rc_map_list dvico_mce_map = {
 	.map = {
 		.scan     = rc_map_dvico_mce_table,
-		.size     = ARRAY_SIZE(rc_map_dvico_mce_table),
+		.entries  = ARRAY_SIZE(rc_map_dvico_mce_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DVICO_MCE,
 	}

index ba9ef9b75777..185a8073211e 100644
@@ -50,7 +50,7 @@ static struct rc_map_table rc_map_dvico_portable_table[] = {
 static struct rc_map_list dvico_portable_map = {
 	.map = {
 		.scan     = rc_map_dvico_portable_table,
-		.size     = ARRAY_SIZE(rc_map_dvico_portable_table),
+		.entries  = ARRAY_SIZE(rc_map_dvico_portable_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_DVICO_PORTABLE,
 	}

index 8a51fe632840..f7feebc16268 100644
@@ -42,7 +42,7 @@ static struct rc_map_table em_terratec[] = {
 static struct rc_map_list em_terratec_map = {
 	.map = {
 		.scan     = em_terratec,
-		.size     = ARRAY_SIZE(em_terratec),
+		.entries  = ARRAY_SIZE(em_terratec),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_EM_TERRATEC,
 	}

index 320e184f4298..3afe8feb2bae 100644
@@ -54,7 +54,7 @@ static struct rc_map_table encore_enltv_fm53[] = {
 static struct rc_map_list encore_enltv_fm53_map = {
 	.map = {
 		.scan     = encore_enltv_fm53,
-		.size     = ARRAY_SIZE(encore_enltv_fm53),
+		.entries  = ARRAY_SIZE(encore_enltv_fm53),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_ENCORE_ENLTV_FM53,
 	}

index 0b235d72e57d..81b6f6fcf5d0 100644
@@ -85,7 +85,7 @@ static struct rc_map_table encore_enltv[] = {
 static struct rc_map_list encore_enltv_map = {
 	.map = {
 		.scan     = encore_enltv,
-		.size     = ARRAY_SIZE(encore_enltv),
+		.entries  = ARRAY_SIZE(encore_enltv),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_ENCORE_ENLTV,
 	}

index d8057f41252d..5fb3142d707c 100644
@@ -63,7 +63,7 @@ static struct rc_map_table encore_enltv2[] = {
 static struct rc_map_list encore_enltv2_map = {
 	.map = {
 		.scan     = encore_enltv2,
-		.size     = ARRAY_SIZE(encore_enltv2),
+		.entries  = ARRAY_SIZE(encore_enltv2),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_ENCORE_ENLTV2,
 	}

index 95295f6882b1..159d3a17d1d5 100644
@@ -34,7 +34,7 @@ static struct rc_map_table evga_indtube[] = {
 static struct rc_map_list evga_indtube_map = {
 	.map = {
 		.scan     = evga_indtube,
-		.size     = ARRAY_SIZE(evga_indtube),
+		.entries  = ARRAY_SIZE(evga_indtube),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_EVGA_INDTUBE,
 	}

index 522e772f7c2b..a1deb8f42ce6 100644
@@ -69,7 +69,7 @@ static struct rc_map_table eztv[] = {
 static struct rc_map_list eztv_map = {
 	.map = {
 		.scan     = eztv,
-		.size     = ARRAY_SIZE(eztv),
+		.entries  = ARRAY_SIZE(eztv),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_EZTV,
 	}

index fcb3bcadd82d..ded68d454cee 100644
@@ -50,7 +50,7 @@ static struct rc_map_table flydvb[] = {
 static struct rc_map_list flydvb_map = {
 	.map = {
 		.scan     = flydvb,
-		.size     = ARRAY_SIZE(flydvb),
+		.entries  = ARRAY_SIZE(flydvb),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_FLYDVB,
 	}

index fcb70c9507cf..a80d787247dc 100644
@@ -43,7 +43,7 @@ static struct rc_map_table flyvideo[] = {
 static struct rc_map_list flyvideo_map = {
 	.map = {
 		.scan     = flyvideo,
-		.size     = ARRAY_SIZE(flyvideo),
+		.entries  = ARRAY_SIZE(flyvideo),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_FLYVIDEO,
 	}

index 43f73db91098..f327623846cd 100644
@@ -71,7 +71,7 @@ static struct rc_map_table fusionhdtv_mce[] = {
 static struct rc_map_list fusionhdtv_mce_map = {
 	.map = {
 		.scan     = fusionhdtv_mce,
-		.size     = ARRAY_SIZE(fusionhdtv_mce),
+		.entries  = ARRAY_SIZE(fusionhdtv_mce),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_FUSIONHDTV_MCE,
 	}

index 8a446d125789..f25e844f830b 100644
@@ -54,7 +54,7 @@ static struct rc_map_table gadmei_rm008z[] = {
 static struct rc_map_list gadmei_rm008z_map = {
 	.map = {
 		.scan     = gadmei_rm008z,
-		.size     = ARRAY_SIZE(gadmei_rm008z),
+		.entries  = ARRAY_SIZE(gadmei_rm008z),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_GADMEI_RM008Z,
 	}

index d3f2e960c925..dd33d1b3351a 100644
@@ -26,7 +26,7 @@ static struct rc_map_table geekbox[] = {
 static struct rc_map_list geekbox_map = {
 	.map = {
 		.scan     = geekbox,
-		.size     = ARRAY_SIZE(geekbox),
+		.entries  = ARRAY_SIZE(geekbox),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_GEEKBOX,
 	}

index e49828ea2b80..29d067bf14e8 100644
@@ -57,7 +57,7 @@ static struct rc_map_table genius_tvgo_a11mce[] = {
 static struct rc_map_list genius_tvgo_a11mce_map = {
 	.map = {
 		.scan     = genius_tvgo_a11mce,
-		.size     = ARRAY_SIZE(genius_tvgo_a11mce),
+		.entries  = ARRAY_SIZE(genius_tvgo_a11mce),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_GENIUS_TVGO_A11MCE,
 	}

index a044991e30ba..3982b4c15393 100644
@@ -52,7 +52,7 @@ static struct rc_map_table gotview7135[] = {
 static struct rc_map_list gotview7135_map = {
 	.map = {
 		.scan     = gotview7135,
-		.size     = ARRAY_SIZE(gotview7135),
+		.entries  = ARRAY_SIZE(gotview7135),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_GOTVIEW7135,
 	}

index 9e64c0b2d18e..e89931e756ab 100644
@@ -308,7 +308,7 @@ static struct rc_map_table rc5_hauppauge_new[] = {
 static struct rc_map_list rc5_hauppauge_new_map = {
 	.map = {
 		.scan     = rc5_hauppauge_new,
-		.size     = ARRAY_SIZE(rc5_hauppauge_new),
+		.entries  = ARRAY_SIZE(rc5_hauppauge_new),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_HAUPPAUGE,
 	}

index b10ad674c32a..3ca32efc8f7b 100644
@@ -43,7 +43,7 @@ static struct rc_map_table hisi_poplar_keymap[] = {
 static struct rc_map_list hisi_poplar_map = {
 	.map = {
 		.scan	  = hisi_poplar_keymap,
-		.size	  = ARRAY_SIZE(hisi_poplar_keymap),
+		.entries  = ARRAY_SIZE(hisi_poplar_keymap),
 		.rc_proto = RC_PROTO_NEC,
 		.name	  = RC_MAP_HISI_POPLAR,
 	}

index 24dcb38df27c..90d5c0286829 100644
@@ -55,7 +55,7 @@ static struct rc_map_table hisi_tv_demo_keymap[] = {
 static struct rc_map_list hisi_tv_demo_map = {
 	.map = {
 		.scan	  = hisi_tv_demo_keymap,
-		.size	  = ARRAY_SIZE(hisi_tv_demo_keymap),
+		.entries  = ARRAY_SIZE(hisi_tv_demo_keymap),
 		.rc_proto = RC_PROTO_NEC,
 		.name	  = RC_MAP_HISI_TV_DEMO,
 	}

index 130f685ae30e..8cf091850cae 100644
@@ -115,7 +115,7 @@ static struct rc_map_table imon_mce[] = {
 static struct rc_map_list imon_mce_map = {
 	.map = {
 		.scan     = imon_mce,
-		.size     = ARRAY_SIZE(imon_mce),
+		.entries  = ARRAY_SIZE(imon_mce),
 		/* its RC6, but w/a hardware decoder */
 		.rc_proto = RC_PROTO_RC6_MCE,
 		.name     = RC_MAP_IMON_MCE,

index cd5ba44d033c..2e571e2f8ac1 100644
@@ -129,7 +129,7 @@ static struct rc_map_table imon_pad[] = {
 static struct rc_map_list imon_pad_map = {
 	.map = {
 		.scan     = imon_pad,
-		.size     = ARRAY_SIZE(imon_pad),
+		.entries  = ARRAY_SIZE(imon_pad),
 		.rc_proto = RC_PROTO_IMON,
 		.name     = RC_MAP_IMON_PAD,
 	}

index e4124fadf705..337928253144 100644
@@ -59,7 +59,7 @@ static struct rc_map_table imon_rsc[] = {
 static struct rc_map_list imon_rsc_map = {
 	.map = {
 		.scan     = imon_rsc,
-		.size     = ARRAY_SIZE(imon_rsc),
+		.entries  = ARRAY_SIZE(imon_rsc),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_IMON_RSC,
 	}

index 95256e85458a..8279190b7b5f 100644
@@ -61,7 +61,7 @@ static struct rc_map_table iodata_bctv7e[] = {
 static struct rc_map_list iodata_bctv7e_map = {
 	.map = {
 		.scan     = iodata_bctv7e,
-		.size     = ARRAY_SIZE(iodata_bctv7e),
+		.entries  = ARRAY_SIZE(iodata_bctv7e),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_IODATA_BCTV7E,
 	}

index d80764c98f44..9a707fed9b3d 100644
@@ -68,7 +68,7 @@ static struct rc_map_table it913x_v1_rc[] = {
 static struct rc_map_list it913x_v1_map = {
 	.map = {
 		.scan     = it913x_v1_rc,
-		.size     = ARRAY_SIZE(it913x_v1_rc),
+		.entries  = ARRAY_SIZE(it913x_v1_rc),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_IT913X_V1,
 	}

index c37358cf8b86..a38bbfccb9ff 100644
@@ -67,7 +67,7 @@ static struct rc_map_table it913x_v2_rc[] = {
 static struct rc_map_list it913x_v2_map = {
 	.map = {
 		.scan     = it913x_v2_rc,
-		.size     = ARRAY_SIZE(it913x_v2_rc),
+		.entries  = ARRAY_SIZE(it913x_v2_rc),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_IT913X_V2,
 	}

index bea50c6f7e99..c93d19d693ce 100644
@@ -60,7 +60,7 @@ static struct rc_map_table kaiomy[] = {
 static struct rc_map_list kaiomy_map = {
 	.map = {
 		.scan     = kaiomy,
-		.size     = ARRAY_SIZE(kaiomy),
+		.entries  = ARRAY_SIZE(kaiomy),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_KAIOMY,
 	}

index 2b7161e1bc3f..94e5b076862c 100644
@@ -31,7 +31,7 @@ static struct rc_map_table khadas[] = {
 static struct rc_map_list khadas_map = {
 	.map = {
 		.scan     = khadas,
-		.size     = ARRAY_SIZE(khadas),
+		.entries  = ARRAY_SIZE(khadas),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_KHADAS,
 	}

index 2121cad8d3df..893fa512cf48 100644
@@ -52,7 +52,7 @@ static struct rc_map_table khamsin[] = {
 static struct rc_map_list khamsin_map = {
 	.map = {
 		.scan     = khamsin,
-		.size     = ARRAY_SIZE(khamsin),
+		.entries  = ARRAY_SIZE(khamsin),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_KHAMSIN,
 	}

index f849dd6b7ef2..e7aa537e65ee 100644
@@ -56,7 +56,7 @@ static struct rc_map_table kworld_315u[] = {
 static struct rc_map_list kworld_315u_map = {
 	.map = {
 		.scan     = kworld_315u,
-		.size     = ARRAY_SIZE(kworld_315u),
+		.entries  = ARRAY_SIZE(kworld_315u),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_KWORLD_315U,
 	}

index 630ef7c330d9..97eb43f69f46 100644
@@ -75,7 +75,7 @@ static struct rc_map_table kworld_pc150u[] = {
 static struct rc_map_list kworld_pc150u_map = {
 	.map = {
 		.scan     = kworld_pc150u,
-		.size     = ARRAY_SIZE(kworld_pc150u),
+		.entries  = ARRAY_SIZE(kworld_pc150u),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_KWORLD_PC150U,
 	}

index 1fb9dc434685..6f40894e9c1f 100644
@@ -76,7 +76,7 @@ static struct rc_map_table kworld_plus_tv_analog[] = {
 static struct rc_map_list kworld_plus_tv_analog_map = {
 	.map = {
 		.scan     = kworld_plus_tv_analog,
-		.size     = ARRAY_SIZE(kworld_plus_tv_analog),
+		.entries  = ARRAY_SIZE(kworld_plus_tv_analog),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_KWORLD_PLUS_TV_ANALOG,
 	}

index c637312643b7..b9402ea6a5e2 100644
@@ -64,7 +64,7 @@ static struct rc_map_table leadtek_y04g0051[] = {
 static struct rc_map_list leadtek_y04g0051_map = {
 	.map = {
 		.scan     = leadtek_y04g0051,
-		.size     = ARRAY_SIZE(leadtek_y04g0051),
+		.entries  = ARRAY_SIZE(leadtek_y04g0051),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_LEADTEK_Y04G0051,
 	}

index 575485655a85..fa83d6999efc 100644
@@ -83,7 +83,7 @@ static struct rc_map_table lme2510_rc[] = {
 static struct rc_map_list lme2510_map = {
 	.map = {
 		.scan     = lme2510_rc,
-		.size     = ARRAY_SIZE(lme2510_rc),
+		.entries  = ARRAY_SIZE(lme2510_rc),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_LME2510,
 	}

index b81149a0dfd8..5aa6043972d5 100644
@@ -107,7 +107,7 @@ static struct rc_map_table manli[] = {
 static struct rc_map_list manli_map = {
 	.map = {
 		.scan     = manli,
-		.size     = ARRAY_SIZE(manli),
+		.entries  = ARRAY_SIZE(manli),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_MANLI,
 	}

index 273fe1a304f0..e40e8c01dbbb 100644
@@ -68,7 +68,7 @@ static struct rc_map_table mecool_kii_pro[] = {
 static struct rc_map_list mecool_kii_pro_map = {
 	.map = {
 		.scan     = mecool_kii_pro,
-		.size     = ARRAY_SIZE(mecool_kii_pro),
+		.entries  = ARRAY_SIZE(mecool_kii_pro),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_MECOOL_KII_PRO,
 	}

index 53fd7c895ddc..d7234645c29d 100644
@@ -65,7 +65,7 @@ static struct rc_map_table mecool_kiii_pro[] = {
 static struct rc_map_list mecool_kiii_pro_map = {
 	.map = {
 		.scan     = mecool_kiii_pro,
-		.size     = ARRAY_SIZE(mecool_kiii_pro),
+		.entries  = ARRAY_SIZE(mecool_kiii_pro),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_MECOOL_KIII_PRO,
 	}

index bf74912859b3..2e843414710c 100644
@@ -86,7 +86,7 @@ static struct rc_map_table medion_x10_digitainer[] = {
 static struct rc_map_list medion_x10_digitainer_map = {
 	.map = {
 		.scan     = medion_x10_digitainer,
-		.size     = ARRAY_SIZE(medion_x10_digitainer),
+		.entries  = ARRAY_SIZE(medion_x10_digitainer),
 		.rc_proto = RC_PROTO_OTHER,
 		.name     = RC_MAP_MEDION_X10_DIGITAINER,
 	}

index 293045c9aaa5..1b3161c4813f 100644
@@ -71,7 +71,7 @@ static struct rc_map_table medion_x10_or2x[] = {
 static struct rc_map_list medion_x10_or2x_map = {
 	.map = {
 		.scan     = medion_x10_or2x,
-		.size     = ARRAY_SIZE(medion_x10_or2x),
+		.entries  = ARRAY_SIZE(medion_x10_or2x),
 		.rc_proto = RC_PROTO_OTHER,
 		.name     = RC_MAP_MEDION_X10_OR2X,
 	}

index 3ea8fdbaf18c..696335cd9c6d 100644
@@ -81,7 +81,7 @@ static struct rc_map_table medion_x10[] = {
 static struct rc_map_list medion_x10_map = {
 	.map = {
 		.scan     = medion_x10,
-		.size     = ARRAY_SIZE(medion_x10),
+		.entries  = ARRAY_SIZE(medion_x10),
 		.rc_proto = RC_PROTO_OTHER,
 		.name     = RC_MAP_MEDION_X10,
 	}

index ce16e964e72e..7979f8a45bdd 100644
@@ -32,7 +32,7 @@ static struct rc_map_table minix_neo[] = {
 static struct rc_map_list minix_neo_map = {
 	.map = {
 		.scan     = minix_neo,
-		.size     = ARRAY_SIZE(minix_neo),
+		.entries  = ARRAY_SIZE(minix_neo),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_MINIX_NEO,
 	}

index f152626fd802..988bd85ee570 100644
@@ -32,7 +32,7 @@ static struct rc_map_table msi_digivox_ii[] = {
 static struct rc_map_list msi_digivox_ii_map = {
 	.map = {
 		.scan     = msi_digivox_ii,
-		.size     = ARRAY_SIZE(msi_digivox_ii),
+		.entries  = ARRAY_SIZE(msi_digivox_ii),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_MSI_DIGIVOX_II,
 	}

index 1250cde3367d..e5a90d2d548c 100644
@@ -50,7 +50,7 @@ static struct rc_map_table msi_digivox_iii[] = {
 static struct rc_map_list msi_digivox_iii_map = {
 	.map = {
 		.scan     = msi_digivox_iii,
-		.size     = ARRAY_SIZE(msi_digivox_iii),
+		.entries  = ARRAY_SIZE(msi_digivox_iii),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_MSI_DIGIVOX_III,
 	}

index 648bac448f29..66f462c4569b 100644
@@ -96,7 +96,7 @@ static struct rc_map_table msi_tvanywhere_plus[] = {
 static struct rc_map_list msi_tvanywhere_plus_map = {
 	.map = {
 		.scan     = msi_tvanywhere_plus,
-		.size     = ARRAY_SIZE(msi_tvanywhere_plus),
+		.entries  = ARRAY_SIZE(msi_tvanywhere_plus),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_MSI_TVANYWHERE_PLUS,
 	}

index b59af39ba005..db609dd2e348 100644
@@ -42,7 +42,7 @@ static struct rc_map_table msi_tvanywhere[] = {
 static struct rc_map_list msi_tvanywhere_map = {
 	.map = {
 		.scan     = msi_tvanywhere,
-		.size     = ARRAY_SIZE(msi_tvanywhere),
+		.entries  = ARRAY_SIZE(msi_tvanywhere),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_MSI_TVANYWHERE,
 	}

index f32b8281459b..8dc1db9c6b8e 100644
@@ -45,7 +45,7 @@ static struct rc_map_table mygica_utv3[] = {
 static struct rc_map_list mygica_utv3_map = {
 	.map = {
 		.scan     = mygica_utv3,
-		.size     = ARRAY_SIZE(mygica_utv3),
+		.entries  = ARRAY_SIZE(mygica_utv3),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_MYGICA_UTV3,
 	}

index 23b75269d307..809024407f3e 100644
@@ -69,7 +69,7 @@ static struct rc_map_table nebula[] = {
 static struct rc_map_list nebula_map = {
 	.map = {
 		.scan     = nebula,
-		.size     = ARRAY_SIZE(nebula),
+		.entries  = ARRAY_SIZE(nebula),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_NEBULA,
 	}

index 94340a1864a0..b2e850ff2eea 100644
@@ -130,7 +130,7 @@ static struct rc_map_table nec_terratec_cinergy_xs[] = {
 static struct rc_map_list nec_terratec_cinergy_xs_map = {
 	.map = {
 		.scan     = nec_terratec_cinergy_xs,
-		.size     = ARRAY_SIZE(nec_terratec_cinergy_xs),
+		.entries  = ARRAY_SIZE(nec_terratec_cinergy_xs),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_NEC_TERRATEC_CINERGY_XS,
 	}

index da00003a5e79..f57fb87b67b5 100644
@@ -58,7 +58,7 @@ static struct rc_map_table norwood[] = {
 static struct rc_map_list norwood_map = {
 	.map = {
 		.scan     = norwood,
-		.size     = ARRAY_SIZE(norwood),
+		.entries  = ARRAY_SIZE(norwood),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_NORWOOD,
 	}

index 6f4412922e0c..f79f47a54a4b 100644
@@ -53,7 +53,7 @@ static struct rc_map_table npgtech[] = {
 static struct rc_map_list npgtech_map = {
 	.map = {
 		.scan     = npgtech,
-		.size     = ARRAY_SIZE(npgtech),
+		.entries  = ARRAY_SIZE(npgtech),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_NPGTECH,
 	}

index 0353229a4915..dd51661dbd20 100644
@@ -31,7 +31,7 @@ static struct rc_map_table odroid[] = {
 static struct rc_map_list odroid_map = {
 	.map = {
 		.scan     = odroid,
-		.size     = ARRAY_SIZE(odroid),
+		.entries  = ARRAY_SIZE(odroid),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_ODROID,
 	}

index 6583bf4fcb04..8b026b90a300 100644
@@ -53,7 +53,7 @@ static struct rc_map_table pctv_sedna[] = {
 static struct rc_map_list pctv_sedna_map = {
 	.map = {
 		.scan     = pctv_sedna,
-		.size     = ARRAY_SIZE(pctv_sedna),
+		.entries  = ARRAY_SIZE(pctv_sedna),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PCTV_SEDNA,
 	}

index bcdb99997d4d..e9977f4a4c25 100644
@@ -42,7 +42,7 @@ static struct rc_map_table pine64[] = {
 static struct rc_map_list pine64_map = {
 	.map = {
 		.scan     = pine64,
-		.size     = ARRAY_SIZE(pine64),
+		.entries  = ARRAY_SIZE(pine64),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_PINE64,
 	}

index f33c38644f83..925aad59b16c 100644
@@ -67,7 +67,7 @@ static struct rc_map_table pinnacle_color[] = {
 static struct rc_map_list pinnacle_color_map = {
 	.map = {
 		.scan     = pinnacle_color,
-		.size     = ARRAY_SIZE(pinnacle_color),
+		.entries  = ARRAY_SIZE(pinnacle_color),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PINNACLE_COLOR,
 	}

index 22ef3d4e2e71..56e93d153bd3 100644
@@ -62,7 +62,7 @@ static struct rc_map_table pinnacle_grey[] = {
 static struct rc_map_list pinnacle_grey_map = {
 	.map = {
 		.scan     = pinnacle_grey,
-		.size     = ARRAY_SIZE(pinnacle_grey),
+		.entries  = ARRAY_SIZE(pinnacle_grey),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PINNACLE_GREY,
 	}

index 35f0c790cc0c..944d304df55a 100644
@@ -43,7 +43,7 @@ static struct rc_map_table pinnacle_pctv_hd[] = {
 static struct rc_map_list pinnacle_pctv_hd_map = {
 	.map = {
 		.scan     = pinnacle_pctv_hd,
-		.size     = ARRAY_SIZE(pinnacle_pctv_hd),
+		.entries  = ARRAY_SIZE(pinnacle_pctv_hd),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_PINNACLE_PCTV_HD,
 	}

index 0966ebf0903a..f31135978ab5 100644
@@ -50,7 +50,7 @@ static struct rc_map_table pixelview_002t[] = {
 static struct rc_map_list pixelview_map = {
 	.map = {
 		.scan     = pixelview_002t,
-		.size     = ARRAY_SIZE(pixelview_002t),
+		.entries  = ARRAY_SIZE(pixelview_002t),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_PIXELVIEW_002T,
 	}

index e18774473809..0a305f68dea2 100644
@@ -56,7 +56,7 @@ static struct rc_map_table pixelview_mk12[] = {
 static struct rc_map_list pixelview_map = {
 	.map = {
 		.scan     = pixelview_mk12,
-		.size     = ARRAY_SIZE(pixelview_mk12),
+		.entries  = ARRAY_SIZE(pixelview_mk12),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_PIXELVIEW_MK12,
 	}

index cf7f1cf8c3b5..fc324eab8450 100644
@@ -56,7 +56,7 @@ static struct rc_map_table pixelview_new[] = {
 static struct rc_map_list pixelview_new_map = {
 	.map = {
 		.scan     = pixelview_new,
-		.size     = ARRAY_SIZE(pixelview_new),
+		.entries  = ARRAY_SIZE(pixelview_new),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PIXELVIEW_NEW,
 	}

index 567ad0a076fc..219579b92a7e 100644
@@ -55,7 +55,7 @@ static struct rc_map_table pixelview[] = {
 static struct rc_map_list pixelview_map = {
 	.map = {
 		.scan     = pixelview,
-		.size     = ARRAY_SIZE(pixelview),
+		.entries  = ARRAY_SIZE(pixelview),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PIXELVIEW,
 	}

index e7a6add1df26..53bf725caec7 100644
@@ -54,7 +54,7 @@ static struct rc_map_table powercolor_real_angel[] = {
 static struct rc_map_list powercolor_real_angel_map = {
 	.map = {
 		.scan     = powercolor_real_angel,
-		.size     = ARRAY_SIZE(powercolor_real_angel),
+		.entries  = ARRAY_SIZE(powercolor_real_angel),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_POWERCOLOR_REAL_ANGEL,
 	}

index 1300482a6119..75b1661b933f 100644
@@ -42,7 +42,7 @@ static struct rc_map_table proteus_2309[] = {
 static struct rc_map_list proteus_2309_map = {
 	.map = {
 		.scan     = proteus_2309,
-		.size     = ARRAY_SIZE(proteus_2309),
+		.entries  = ARRAY_SIZE(proteus_2309),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PROTEUS_2309,
 	}

index 9f6ee0be1347..87498d63f717 100644
@@ -54,7 +54,7 @@ static struct rc_map_table purpletv[] = {
 static struct rc_map_list purpletv_map = {
 	.map = {
 		.scan     = purpletv,
-		.size     = ARRAY_SIZE(purpletv),
+		.entries  = ARRAY_SIZE(purpletv),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PURPLETV,
 	}

index 539e8573eb19..3a338867977f 100644
@@ -51,7 +51,7 @@ static struct rc_map_table pv951[] = {
 static struct rc_map_list pv951_map = {
 	.map = {
 		.scan     = pv951,
-		.size     = ARRAY_SIZE(pv951),
+		.entries  = ARRAY_SIZE(pv951),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_PV951,
 	}

index ef1c61eb99b2..3ed40dabe537 100644
@@ -93,7 +93,7 @@ static struct rc_map_table rc6_mce[] = {
 static struct rc_map_list rc6_mce_map = {
 	.map = {
 		.scan     = rc6_mce,
-		.size     = ARRAY_SIZE(rc6_mce),
+		.entries  = ARRAY_SIZE(rc6_mce),
 		.rc_proto = RC_PROTO_RC6_MCE,
 		.name     = RC_MAP_RC6_MCE,
 	}

index 088ead8f736b..e80eafa08912 100644
@@ -51,7 +51,7 @@ static struct rc_map_table real_audio_220_32_keys[] = {
 static struct rc_map_list real_audio_220_32_keys_map = {
 	.map = {
 		.scan     = real_audio_220_32_keys,
-		.size     = ARRAY_SIZE(real_audio_220_32_keys),
+		.entries  = ARRAY_SIZE(real_audio_220_32_keys),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_REAL_AUDIO_220_32_KEYS,
 	}

index af50d1ca4b15..7223234fae71 100644
@@ -50,7 +50,7 @@ static struct rc_map_table reddo[] = {
 static struct rc_map_list reddo_map = {
 	.map = {
 		.scan     = reddo,
-		.size     = ARRAY_SIZE(reddo),
+		.entries  = ARRAY_SIZE(reddo),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_REDDO,
 	}

index defc77932e10..1826f06efa6d 100644
@@ -47,7 +47,7 @@ static struct rc_map_table siemens_gigaset_rc20[] = {
 static struct rc_map_list siemens_gigaset_rc20_map = {
 	.map = {
 		.scan     = siemens_gigaset_rc20,
-		.size     = ARRAY_SIZE(siemens_gigaset_rc20),
+		.entries  = ARRAY_SIZE(siemens_gigaset_rc20),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_SIEMENS_GIGASET_RC20,
 	}

index 826f44595e70..89337d843d60 100644
@@ -71,7 +71,7 @@ static struct rc_map_table snapstream_firefly[] = {
 static struct rc_map_list snapstream_firefly_map = {
 	.map = {
 		.scan     = snapstream_firefly,
-		.size     = ARRAY_SIZE(snapstream_firefly),
+		.entries  = ARRAY_SIZE(snapstream_firefly),
 		.rc_proto = RC_PROTO_OTHER,
 		.name     = RC_MAP_SNAPSTREAM_FIREFLY,
 	}

index b82c3cdfca3b..a9c48e10c61c 100644
@@ -54,7 +54,7 @@ static struct rc_map_table streamzap[] = {
 static struct rc_map_list streamzap_map = {
 	.map = {
 		.scan     = streamzap,
-		.size     = ARRAY_SIZE(streamzap),
+		.entries  = ARRAY_SIZE(streamzap),
 		.rc_proto = RC_PROTO_RC5_SZ,
 		.name     = RC_MAP_STREAMZAP,
 	}

index a333ade3b1d2..d173cf29fb24 100644
@@ -48,7 +48,7 @@ static struct rc_map_table su3000[] = {
 static struct rc_map_list su3000_map = {
 	.map = {
 		.scan     = su3000,
-		.size     = ARRAY_SIZE(su3000),
+		.entries  = ARRAY_SIZE(su3000),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_SU3000,
 	}

index b5d77a0c94ed..999ff2e57677 100644
@@ -54,7 +54,7 @@ static struct rc_map_table tanix_tx3mini[] = {
 static struct rc_map_list tanix_tx3mini_map = {
 	.map = {
 		.scan     = tanix_tx3mini,
-		.size     = ARRAY_SIZE(tanix_tx3mini),
+		.entries  = ARRAY_SIZE(tanix_tx3mini),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_TANIX_TX3MINI,
 	}

index 91db9017845a..9c052dd2c212 100644
@@ -45,7 +45,7 @@ static struct rc_map_table tanix_tx5max[] = {
 static struct rc_map_list tanix_tx5max_map = {
 	.map = {
 		.scan     = tanix_tx5max,
-		.size     = ARRAY_SIZE(tanix_tx5max),
+		.entries  = ARRAY_SIZE(tanix_tx5max),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_TANIX_TX5MAX,
 	}

index 426c767c907f..86c7e1917adb 100644
@@ -48,7 +48,7 @@ static struct rc_map_table tbs_nec[] = {
 static struct rc_map_list tbs_nec_map = {
 	.map = {
 		.scan     = tbs_nec,
-		.size     = ARRAY_SIZE(tbs_nec),
+		.entries  = ARRAY_SIZE(tbs_nec),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TBS_NEC,
 	}

index 07d5e0884eb9..07529e3ceffb 100644
@@ -50,7 +50,7 @@ static struct rc_map_table technisat_ts35[] = {
 static struct rc_map_list technisat_ts35_map = {
 	.map = {
 		.scan     = technisat_ts35,
-		.size     = ARRAY_SIZE(technisat_ts35),
+		.entries  = ARRAY_SIZE(technisat_ts35),
 		.rc_proto = RC_PROTO_UNKNOWN,
 		.name     = RC_MAP_TECHNISAT_TS35,
 	}

index 74ac89d37966..c37bc0d73e06 100644
@@ -67,7 +67,7 @@ static struct rc_map_table technisat_usb2[] = {
 static struct rc_map_list technisat_usb2_map = {
 	.map = {
 		.scan     = technisat_usb2,
-		.size     = ARRAY_SIZE(technisat_usb2),
+		.entries  = ARRAY_SIZE(technisat_usb2),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_TECHNISAT_USB2,
 	}

index d44891308193..ea39a7bb4312 100644
@@ -62,7 +62,7 @@ static struct rc_map_table terratec_cinergy_c_pci[] = {
 static struct rc_map_list terratec_cinergy_c_pci_map = {
 	.map = {
 		.scan     = terratec_cinergy_c_pci,
-		.size     = ARRAY_SIZE(terratec_cinergy_c_pci),
+		.entries  = ARRAY_SIZE(terratec_cinergy_c_pci),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TERRATEC_CINERGY_C_PCI,
 	}

index dbbb1ba0247b..e87be431c341 100644
@@ -60,7 +60,7 @@ static struct rc_map_table terratec_cinergy_s2_hd[] = {
 static struct rc_map_list terratec_cinergy_s2_hd_map = {
 	.map = {
 		.scan     = terratec_cinergy_s2_hd,
-		.size     = ARRAY_SIZE(terratec_cinergy_s2_hd),
+		.entries  = ARRAY_SIZE(terratec_cinergy_s2_hd),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TERRATEC_CINERGY_S2_HD,
 	}

index a9452d581339..b9193a7189a2 100644
@@ -65,7 +65,7 @@ static struct rc_map_table terratec_cinergy_xs[] = {
 static struct rc_map_list terratec_cinergy_xs_map = {
 	.map = {
 		.scan     = terratec_cinergy_xs,
-		.size     = ARRAY_SIZE(terratec_cinergy_xs),
+		.entries  = ARRAY_SIZE(terratec_cinergy_xs),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TERRATEC_CINERGY_XS,
 	}

index ea259d88769b..47b190b9a2fb 100644
@@ -37,7 +37,7 @@ static struct rc_map_table terratec_slim_2[] = {
 static struct rc_map_list terratec_slim_2_map = {
 	.map = {
 		.scan     = terratec_slim_2,
-		.size     = ARRAY_SIZE(terratec_slim_2),
+		.entries  = ARRAY_SIZE(terratec_slim_2),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_TERRATEC_SLIM_2,
 	}

index bb40cbd58ebe..557f91676a84 100644
@@ -44,7 +44,7 @@ static struct rc_map_table terratec_slim[] = {
 static struct rc_map_list terratec_slim_map = {
 	.map = {
 		.scan     = terratec_slim,
-		.size     = ARRAY_SIZE(terratec_slim),
+		.entries  = ARRAY_SIZE(terratec_slim),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_TERRATEC_SLIM,
 	}

index ee7f8014742b..cbac237990a8 100644
@@ -61,7 +61,7 @@ static struct rc_map_table tevii_nec[] = {
 static struct rc_map_list tevii_nec_map = {
 	.map = {
 		.scan     = tevii_nec,
-		.size     = ARRAY_SIZE(tevii_nec),
+		.entries  = ARRAY_SIZE(tevii_nec),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TEVII_NEC,
 	}

index c02b8c8abd5c..35429d5e8f7a 100644
@@ -72,7 +72,7 @@ static struct rc_map_table tivo[] = {
 static struct rc_map_list tivo_map = {
 	.map = {
 		.scan     = tivo,
-		.size     = ARRAY_SIZE(tivo),
+		.entries  = ARRAY_SIZE(tivo),
 		.rc_proto = RC_PROTO_NEC32,
 		.name     = RC_MAP_TIVO,
 	}

index 290d1cc8577c..2b5f8f851523 100644
@@ -50,7 +50,7 @@ static struct rc_map_table total_media_in_hand_02[] = {
 static struct rc_map_list total_media_in_hand_02_map = {
 	.map = {
 		.scan     = total_media_in_hand_02,
-		.size     = ARRAY_SIZE(total_media_in_hand_02),
+		.entries  = ARRAY_SIZE(total_media_in_hand_02),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_TOTAL_MEDIA_IN_HAND_02,
 	}

index 7f4b31b98f35..afd363d3ff79 100644
@@ -50,7 +50,7 @@ static struct rc_map_table total_media_in_hand[] = {
 static struct rc_map_list total_media_in_hand_map = {
 	.map = {
 		.scan     = total_media_in_hand,
-		.size     = ARRAY_SIZE(total_media_in_hand),
+		.entries  = ARRAY_SIZE(total_media_in_hand),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_TOTAL_MEDIA_IN_HAND,
 	}

index ff01de550904..6ae2aac049b6 100644
@@ -45,7 +45,7 @@ static struct rc_map_table trekstor[] = {
 static struct rc_map_list trekstor_map = {
 	.map = {
 		.scan     = trekstor,
-		.size     = ARRAY_SIZE(trekstor),
+		.entries  = ARRAY_SIZE(trekstor),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_TREKSTOR,
 	}

index eb8d7fc5061a..b8efd1cd6a8e 100644
@@ -55,7 +55,7 @@ static struct rc_map_table tt_1500[] = {
 static struct rc_map_list tt_1500_map = {
 	.map = {
 		.scan     = tt_1500,
-		.size     = ARRAY_SIZE(tt_1500),
+		.entries  = ARRAY_SIZE(tt_1500),
 		.rc_proto = RC_PROTO_RC5,
 		.name     = RC_MAP_TT_1500,
 	}

index 8e5cf8eb0db9..4559eb482a39 100644
@@ -72,7 +72,7 @@ static struct rc_map_table twinhan_dtv_cab_ci[] = {
 static struct rc_map_list twinhan_dtv_cab_ci_map = {
 	.map = {
 		.scan     = twinhan_dtv_cab_ci,
-		.size     = ARRAY_SIZE(twinhan_dtv_cab_ci),
+		.entries  = ARRAY_SIZE(twinhan_dtv_cab_ci),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_TWINHAN_DTV_CAB_CI,
 	}

index 411ce3c8cbd0..82933a4c7d6d 100644
@@ -66,7 +66,7 @@ static struct rc_map_table twinhan_vp1027[] = {
 static struct rc_map_list twinhan_vp1027_map = {
 	.map = {
 		.scan     = twinhan_vp1027,
-		.size     = ARRAY_SIZE(twinhan_vp1027),
+		.entries  = ARRAY_SIZE(twinhan_vp1027),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_TWINHAN_VP1027_DVBS,
 	}

index 40fbf408bf65..c9ed36a580cd 100644
@@ -31,7 +31,7 @@ static struct rc_map_table vega_s9x[] = {
 static struct rc_map_list vega_s9x_map = {
 	.map = {
 		.scan     = vega_s9x,
-		.size     = ARRAY_SIZE(vega_s9x),
+		.entries  = ARRAY_SIZE(vega_s9x),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_VEGA_S9X,
 	}

index 6664cfd0b7f3..06466be0d705 100644
@@ -66,7 +66,7 @@ static struct rc_map_table videomate_k100[] = {
 static struct rc_map_list videomate_k100_map = {
 	.map = {
 		.scan     = videomate_k100,
-		.size     = ARRAY_SIZE(videomate_k100),
+		.entries  = ARRAY_SIZE(videomate_k100),
 		.rc_proto = RC_PROTO_UNKNOWN,     /* Legacy IR type */
 		.name     = RC_MAP_VIDEOMATE_K100,
 	}

index 281cc747229f..d788252892e3 100644
@@ -58,7 +58,7 @@ static struct rc_map_table videomate_s350[] = {
 static struct rc_map_list videomate_s350_map = {
 	.map = {
 		.scan     = videomate_s350,
-		.size     = ARRAY_SIZE(videomate_s350),
+		.entries  = ARRAY_SIZE(videomate_s350),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_VIDEOMATE_S350,
 	}

index 829842425fae..ba430f469b77 100644
@@ -60,7 +60,7 @@ static struct rc_map_table videomate_tv_pvr[] = {
 static struct rc_map_list videomate_tv_pvr_map = {
 	.map = {
 		.scan     = videomate_tv_pvr,
-		.size     = ARRAY_SIZE(videomate_tv_pvr),
+		.entries  = ARRAY_SIZE(videomate_tv_pvr),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_VIDEOMATE_TV_PVR,
 	}

index 10cbc2c781d2..d797a49d0e0b 100644
@@ -60,7 +60,7 @@ static struct rc_map_table kii_pro[] = {
 static struct rc_map_list kii_pro_map = {
 	.map = {
 		.scan     = kii_pro,
-		.size     = ARRAY_SIZE(kii_pro),
+		.entries  = ARRAY_SIZE(kii_pro),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_KII_PRO,
 	}

index 591ec20399f4..c8d448cf39f2 100644
@@ -30,7 +30,7 @@ static struct rc_map_table wetek_hub[] = {
 static struct rc_map_list wetek_hub_map = {
 	.map = {
 		.scan     = wetek_hub,
-		.size     = ARRAY_SIZE(wetek_hub),
+		.entries  = ARRAY_SIZE(wetek_hub),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_WETEK_HUB,
 	}

index ce3b1029df23..198738a95c55 100644
@@ -70,7 +70,7 @@ static struct rc_map_table wetek_play2[] = {
 static struct rc_map_list wetek_play2_map = {
 	.map = {
 		.scan     = wetek_play2,
-		.size     = ARRAY_SIZE(wetek_play2),
+		.entries  = ARRAY_SIZE(wetek_play2),
 		.rc_proto = RC_PROTO_NECX,
 		.name     = RC_MAP_WETEK_PLAY2,
 	}

index edfba31f9ae6..3019bb2eaa8d 100644
@@ -55,7 +55,7 @@ static struct rc_map_table winfast_usbii_deluxe[] = {
 static struct rc_map_list winfast_usbii_deluxe_map = {
 	.map = {
 		.scan     = winfast_usbii_deluxe,
-		.size     = ARRAY_SIZE(winfast_usbii_deluxe),
+		.entries  = ARRAY_SIZE(winfast_usbii_deluxe),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_WINFAST_USBII_DELUXE,
 	}

index 89649c8cdee5..0cecf00b4188 100644
@@ -75,7 +75,7 @@ static struct rc_map_table winfast[] = {
 static struct rc_map_list winfast_map = {
 	.map = {
 		.scan     = winfast,
-		.size     = ARRAY_SIZE(winfast),
+		.entries  = ARRAY_SIZE(winfast),
 		.rc_proto = RC_PROTO_UNKNOWN,	/* Legacy IR type */
 		.name     = RC_MAP_WINFAST,
 	}

index a22fcbbfa383..f830fbfd4d57 100644
@@ -60,7 +60,7 @@ static struct rc_map_table x96max[] = {
 static struct rc_map_list x96max_map = {
 	.map = {
 		.scan     = x96max,
-		.size     = ARRAY_SIZE(x96max),
+		.entries  = ARRAY_SIZE(x96max),
 		.rc_proto = RC_PROTO_NEC,
 		.name     = RC_MAP_X96MAX,
 	}

index 1364daf3ae6f..13e0843291fc 100644
@@ -61,7 +61,7 @@ static struct rc_map_table xbox_360[] = {
 static struct rc_map_list xbox_360_map = {
 	.map = {
 		.scan     = xbox_360,
-		.size     = ARRAY_SIZE(xbox_360),
+		.entries  = ARRAY_SIZE(xbox_360),
 		.rc_proto = RC_PROTO_RC6_MCE,
 		.name     = RC_MAP_XBOX_360,
 	}

index 11ab134b05b5..94bb444bb578 100644
@@ -41,7 +41,7 @@ static struct rc_map_table xbox_dvd[] = {
 static struct rc_map_list xbox_dvd_map = {
 	.map = {
 		.scan     = xbox_dvd,
-		.size     = ARRAY_SIZE(xbox_dvd),
+		.entries  = ARRAY_SIZE(xbox_dvd),
 		.rc_proto = RC_PROTO_XBOX_DVD,
 		.name     = RC_MAP_XBOX_DVD,
 	}

index e4bea7b39fd1..b2115914f3d4 100644
@@ -53,7 +53,7 @@ static struct rc_map_table zx_irdec_table[] = {
 static struct rc_map_list zx_irdec_map = {
 	.map = {
 		.scan = zx_irdec_table,
-		.size = ARRAY_SIZE(zx_irdec_table),
+		.entries = ARRAY_SIZE(zx_irdec_table),
 		.rc_proto = RC_PROTO_NEC,
 		.name = RC_MAP_ZX_IRDEC,
 	}

228 lines not on this page · raw message

index f167c37179c8..39cc226e56af 100644
@@ -146,8 +146,8 @@ struct rc_map_table {
  * struct rc_map - represents a keycode map table
  *
  * @scan: pointer to struct &rc_map_table
- * @size: Max number of entries
- * @len: Number of entries that are in use
+ * @capacity: Number of entries @scan has room for
+ * @entries: Number of entries in @scan that are in use
  * @rc_proto: type of the remote controller protocol, as defined at
  *	     enum &rc_proto
  * @name: name of the key map table

@@ -155,8 +155,8 @@ struct rc_map_table {
  */
 struct rc_map {
 	struct rc_map_table	*scan;
-	unsigned int		size;
-	unsigned int		len;
+	unsigned int		capacity;
+	unsigned int		entries;
 	enum rc_proto		rc_proto;
 	const char		*name;
 	spinlock_t		lock;