From patchwork Sun Aug 1 20:21:10 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: 116348 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o71KKmBg011458 for ; Sun, 1 Aug 2010 20:20:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751486Ab0HAUUq (ORCPT ); Sun, 1 Aug 2010 16:20:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11613 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310Ab0HAUUp (ORCPT ); Sun, 1 Aug 2010 16:20:45 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o71KKgur025125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 1 Aug 2010 16:20:42 -0400 Received: from pedra (vpn-10-244.rdu.redhat.com [10.11.10.244]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o71KKcTe018571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 1 Aug 2010 16:20:41 -0400 Date: Sun, 1 Aug 2010 17:21:10 -0300 From: Mauro Carvalho Chehab To: Udi Atar Cc: Linux Media Mailing List Subject: [PATCH 4/6] V4L/DVB: standardize names at rc-dib0700 tables Message-ID: <20100801172110.3c1da080@pedra> In-Reply-To: References: Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 (demeter.kernel.org [140.211.167.41]); Sun, 01 Aug 2010 20:20:48 +0000 (UTC) diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c index f5809f4..ae18320 100644 --- a/drivers/media/IR/keymaps/rc-dib0700-nec.c +++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c @@ -17,7 +17,7 @@ #include -static struct ir_scancode dib0700_table[] = { +static struct ir_scancode dib0700_nec_table[] = { /* Key codes for the Pixelview SBTVD remote */ { 0x8613, KEY_MUTE }, { 0x8612, KEY_POWER }, @@ -98,10 +98,10 @@ static struct ir_scancode dib0700_table[] = { { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */ }; -static struct rc_keymap dib0700_map = { +static struct rc_keymap dib0700_nec_map = { .map = { - .scan = dib0700_table, - .size = ARRAY_SIZE(dib0700_table), + .scan = dib0700_nec_table, + .size = ARRAY_SIZE(dib0700_nec_table), .ir_type = IR_TYPE_NEC, .name = RC_MAP_DIB0700_NEC_TABLE, } @@ -109,12 +109,12 @@ static struct rc_keymap dib0700_map = { static int __init init_rc_map(void) { - return ir_register_map(&dib0700_map); + return ir_register_map(&dib0700_nec_map); } static void __exit exit_rc_map(void) { - ir_unregister_map(&dib0700_map); + ir_unregister_map(&dib0700_nec_map); } module_init(init_rc_map) diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c index e2d0fd2..4a4797c 100644 --- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c +++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c @@ -17,7 +17,7 @@ #include -static struct ir_scancode dib0700_table[] = { +static struct ir_scancode dib0700_rc5_table[] = { /* Key codes for the tiny Pinnacle remote*/ { 0x0700, KEY_MUTE }, { 0x0701, KEY_MENU }, /* Pinnacle logo */ @@ -209,10 +209,10 @@ static struct ir_scancode dib0700_table[] = { { 0x1d3d, KEY_POWER }, }; -static struct rc_keymap dib0700_map = { +static struct rc_keymap dib0700_rc5_map = { .map = { - .scan = dib0700_table, - .size = ARRAY_SIZE(dib0700_table), + .scan = dib0700_rc5_table, + .size = ARRAY_SIZE(dib0700_rc5_table), .ir_type = IR_TYPE_RC5, .name = RC_MAP_DIB0700_RC5_TABLE, } @@ -220,12 +220,12 @@ static struct rc_keymap dib0700_map = { static int __init init_rc_map(void) { - return ir_register_map(&dib0700_map); + return ir_register_map(&dib0700_rc5_map); } static void __exit exit_rc_map(void) { - ir_unregister_map(&dib0700_map); + ir_unregister_map(&dib0700_rc5_map); } module_init(init_rc_map)