[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 83772eb8e39138758ba184c66c3da36ed0ee9cc3..2b61017633551e8a5d618685abb7c2ffc3bbb666 100644 (file)
--- 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 65d951e03c17eb6c56100df45fd01e0116008b5d..1d043ed1bc32ef1c9e274df7b2bd02cc139ec173 100644 (file)
--- 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 87a20ae6fcc05267969da60f76bdc3818edbb8d5..709cb87a7762d3c7747e776bb726070d412446f3 100644 (file)
--- 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;