From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 17 Nov 2010 17:12:46 +0000 (-0300)
Subject: [media] cx231xx: Properly name rc_map name
X-Git-Tag: v2.6.38-rc1~470^2~157
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=29e3ec19d5c88d534ced219d3962d67243e4d310;p=~shefty%2Frdma-dev.git

[media] cx231xx: Properly name rc_map name

rc_map is confusing, as it may be understood as another thing. Properly
rename the field to indicate its usage.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 83772eb8e39..2b610176335 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -412,7 +412,7 @@ struct cx231xx_board cx231xx_boards[] = {
 		.tuner_i2c_master = 2,
 		.demod_i2c_master = 1,
 		.ir_i2c_master = 2,
-		.rc_map = RC_MAP_PIXELVIEW_NEW,
+		.rc_map_name = RC_MAP_PIXELVIEW_NEW,
 		.has_dvb = 1,
 		.demod_addr = 0x10,
 		.norm = V4L2_STD_PAL_M,
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index 65d951e03c1..1d043ed1bc3 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -57,7 +57,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
 	dev_dbg(&dev->udev->dev, "%s\n", __func__);
 
 	/* Only initialize if a rc keycode map is defined */
-	if (!cx231xx_boards[dev->model].rc_map)
+	if (!cx231xx_boards[dev->model].rc_map_name)
 		return -ENODEV;
 
 	request_module("ir-kbd-i2c");
@@ -80,7 +80,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
 	 * an i2c device.
 	 */
 	dev->init_data.get_key = get_key_isdbt;
-	dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map;
+	dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name;
 	/* The i2c micro-controller only outputs the cmd part of NEC protocol */
 	dev->init_data.rc_dev->scanmask = 0xff;
 	dev->init_data.rc_dev->driver_name = "cx231xx";
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index 87a20ae6fcc..709cb87a776 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -349,7 +349,7 @@ struct cx231xx_board {
 	u8 ir_i2c_master;
 
 	/* for devices with I2C chips for IR */
-	char *rc_map;
+	char *rc_map_name;
 
 	unsigned int max_range_640_480:1;
 	unsigned int has_dvb:1;