From patchwork Wed Nov 17 19:08:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 333921 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAHJCAth007360 for ; Wed, 17 Nov 2010 19:12:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934924Ab0KQTMI (ORCPT ); Wed, 17 Nov 2010 14:12:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42003 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756884Ab0KQTMH (ORCPT ); Wed, 17 Nov 2010 14:12:07 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAHJC7hY029571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Nov 2010 14:12:07 -0500 Received: from pedra (vpn-230-120.phx2.redhat.com [10.3.230.120]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAHJC5xI007699 for ; Wed, 17 Nov 2010 14:12:06 -0500 Date: Wed, 17 Nov 2010 17:08:28 -0200 From: Mauro Carvalho Chehab Cc: Linux Media Mailing List Subject: [PATCH 05/10] [media] cx231xx: Properly name rc_map name Message-ID: <20101117170828.203a06e3@pedra> In-Reply-To: References: Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 17 Nov 2010 19:12:10 +0000 (UTC) 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;