Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e3ec19 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ca86674b

drivers/media/video/cx231xx/cx231xx-cards.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ struct cx231xx_board cx231xx_boards[] = { 
		.tuner_i2c_master = 2,

		.tuner_i2c_master = 2,

		.demod_i2c_master = 1,

		.demod_i2c_master = 1,

		.ir_i2c_master = 2,

		.ir_i2c_master = 2,

		.rc_map = RC_MAP_PIXELVIEW_NEW,

		.rc_map_name = RC_MAP_PIXELVIEW_NEW,

		.has_dvb = 1,

		.has_dvb = 1,

		.demod_addr = 0x10,

		.demod_addr = 0x10,

		.norm = V4L2_STD_PAL_M,

		.norm = V4L2_STD_PAL_M,

drivers/media/video/cx231xx/cx231xx-input.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ int cx231xx_ir_init(struct cx231xx *dev) 
	dev_dbg(&dev->udev->dev, "%s\n", __func__);

	dev_dbg(&dev->udev->dev, "%s\n", __func__);





	/* Only initialize if a rc keycode map is defined */

	/* 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;

		return -ENODEV;





	request_module("ir-kbd-i2c");

	request_module("ir-kbd-i2c");
@@ -80,7 +80,7 @@ int cx231xx_ir_init(struct cx231xx *dev) 
	 * an i2c device.

	 * an i2c device.

	 */

	 */

	dev->init_data.get_key = get_key_isdbt;

	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 */

	/* The i2c micro-controller only outputs the cmd part of NEC protocol */

	dev->init_data.rc_dev->scanmask = 0xff;

	dev->init_data.rc_dev->scanmask = 0xff;

	dev->init_data.rc_dev->driver_name = "cx231xx";

	dev->init_data.rc_dev->driver_name = "cx231xx";

drivers/media/video/cx231xx/cx231xx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ struct cx231xx_board { 
	u8 ir_i2c_master;

	u8 ir_i2c_master;





	/* for devices with I2C chips for IR */

	/* for devices with I2C chips for IR */

	char *rc_map;

	char *rc_map_name;





	unsigned int max_range_640_480:1;

	unsigned int max_range_640_480:1;

	unsigned int has_dvb:1;

	unsigned int has_dvb:1;