Linux Media Controller development
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)@casper.infradead.org
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH 05/10] [media] cx231xx: Properly name rc_map name
Date: Wed, 17 Nov 2010 17:08:28 -0200	[thread overview]
Message-ID: <20101117170828.203a06e3@pedra> (raw)
In-Reply-To: <cover.1290020731.git.mchehab@redhat.com>

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 ac4bf2c..bfa3251 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 65d951e..1d043ed 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 87a20ae..709cb87 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;
-- 
1.7.1



  parent reply	other threads:[~2010-11-17 19:12 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1290020731.git.mchehab@redhat.com>
2010-11-17 19:08 ` [PATCH 01/10] [media] rc: remove ir-common module Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 02/10] [media] rc: Remove ir-common.h Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 03/10] [media] rc: rename the remaining things to rc_core Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 04/10] [media] Rename all public generic RC functions from ir_ to rc_ Mauro Carvalho Chehab
2010-11-17 19:08 ` Mauro Carvalho Chehab [this message]
2010-11-17 19:08 ` [PATCH 06/10] [media] rc: Rename remote controller type to rc_type instead of ir_type Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 07/10] [media] rc: Properly name the rc_map struct Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 08/10] [media] rc: Name RC keymap tables as rc_map_table Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 09/10] [media] rc: use rc_map_ prefix for all rc map tables Mauro Carvalho Chehab
2010-11-17 19:08 ` [PATCH 10/10] [media] rc: Rename IR raw interface to ir-raw.c Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101117170828.203a06e3@pedra \
    --to=mchehab@redhat.com \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox