From patchwork Mon Jun 18 19:02:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 12966 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SghGe-0000iG-OE for patchwork@linuxtv.org; Mon, 18 Jun 2012 21:05:41 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1SghGZ-0005RV-IM; Mon, 18 Jun 2012 21:05:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005Ab2FRTFc (ORCPT ); Mon, 18 Jun 2012 15:05:32 -0400 Received: from zose-mta-15.w4a.fr ([176.31.217.10]:60629 "EHLO zose-mta15.web4all.fr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751464Ab2FRTFb convert rfc822-to-8bit (ORCPT ); Mon, 18 Jun 2012 15:05:31 -0400 Received: from localhost (localhost [127.0.0.1]) by zose-mta15.web4all.fr (Postfix) with ESMTP id 71F1C2C323; Mon, 18 Jun 2012 21:00:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at zose1.web4all.fr Received: from zose-mta15.web4all.fr ([127.0.0.1]) by localhost (zose-mta15.web4all.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EnMlfZBynNur; Mon, 18 Jun 2012 21:00:15 +0200 (CEST) Received: from zose-store12.web4all.fr (zose-store-12.w4a.fr [178.33.204.48]) by zose-mta15.web4all.fr (Postfix) with ESMTP id 6A7272C17A; Mon, 18 Jun 2012 21:00:15 +0200 (CEST) Date: Mon, 18 Jun 2012 21:02:44 +0200 (CEST) From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= To: Mauro Carvalho Chehab , Ravi Kumar V , linux-media@vger.kernel.org Message-ID: <1213929032.2884470.1340046164433.JavaMail.root@advansee.com> Subject: [PATCH 2 of 3] media: gpio-ir-recv: add map name MIME-Version: 1.0 X-Originating-IP: [88.188.188.98] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Win)/7.2.0_GA_2669) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.6.18.185414 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, WEBMAIL_XOIP 0, WEBMAIL_X_IP_HDR 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_XOIP 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' Make it possible for gpio-ir-recv users to choose a map name. Cc: Mauro Carvalho Chehab Cc: Ravi Kumar V Cc: Signed-off-by: Benoît Thébaudeau --- .../drivers/media/rc/gpio-ir-recv.c | 2 +- .../include/media/gpio-ir-recv.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git linux-next-HEAD-6c86b58.orig/drivers/media/rc/gpio-ir-recv.c linux-next-HEAD-6c86b58/drivers/media/rc/gpio-ir-recv.c index b41e13c..15e346e 100644 --- linux-next-HEAD-6c86b58.orig/drivers/media/rc/gpio-ir-recv.c +++ linux-next-HEAD-6c86b58/drivers/media/rc/gpio-ir-recv.c @@ -93,7 +93,7 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev) rcdev->input_id.version = 0x0100; rcdev->dev.parent = &pdev->dev; rcdev->driver_name = GPIO_IR_DRIVER_NAME; - rcdev->map_name = RC_MAP_EMPTY; + rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY; gpio_dev->rcdev = rcdev; gpio_dev->gpio_nr = pdata->gpio_nr; diff --git linux-next-HEAD-6c86b58.orig/include/media/gpio-ir-recv.h linux-next-HEAD-6c86b58/include/media/gpio-ir-recv.h index 67797bf..91546f3 100644 --- linux-next-HEAD-6c86b58.orig/include/media/gpio-ir-recv.h +++ linux-next-HEAD-6c86b58/include/media/gpio-ir-recv.h @@ -16,6 +16,7 @@ struct gpio_ir_recv_platform_data { int gpio_nr; bool active_low; + const char *map_name; }; #endif /* __GPIO_IR_RECV_H__ */