From patchwork Fri Aug 19 16:31:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9290565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 57197607FF for ; Fri, 19 Aug 2016 16:31:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49A8F294D2 for ; Fri, 19 Aug 2016 16:31:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E903294D8; Fri, 19 Aug 2016 16:31:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC636294D5 for ; Fri, 19 Aug 2016 16:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754636AbcHSQbV (ORCPT ); Fri, 19 Aug 2016 12:31:21 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:34987 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754510AbcHSQbU (ORCPT ); Fri, 19 Aug 2016 12:31:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From; bh=8imuGLlVvUmakkK0VPEafKyDzu+EBnS/fjy+wQbuRzY=; b=Oc3gQCfY4SB1GMMusw+0m59FjOWnLH4gvL8vw0eu7+S+eKgDM1bBNCvpv4tLZWeaoueXAC0J/xb3OpCKvCmjqVTiIqa0OdokI9tVey7EzIDxYC/xuLmfDCnCAnFOup4Uspghs8GLfGxSAW/G3IPLA7XKlNjsLOMs/Wo0N7lq3AE=; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:54748 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1bamhS-0003KE-7w; Fri, 19 Aug 2016 17:31:18 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1bamhR-0004We-61; Fri, 19 Aug 2016 17:31:17 +0100 From: Russell King To: linux-arm-kernel@lists.infradead.org Cc: Kristoffer Ericson , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH] Input: jornada720_ts - get rid of mach/irqs.h include MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 19 Aug 2016 17:31:17 +0100 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Switch the jornada720 touchscreen driver to obtain its interrupt from the platform device, rather than via a hard-coded interrupt number obtained from the mach/irqs.h header. Signed-off-by: Russell King --- arch/arm/mach-sa1100/jornada720.c | 6 ++++++ drivers/input/touchscreen/jornada720_ts.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 2b96f7bc16bd..010eaea04c69 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -228,9 +228,15 @@ static struct platform_device jornada_kbd_device = { .resource = jornada_kbd_resources, }; +static struct resource jornada_ts_resources[] = { + DEFINE_RES_IRQ(IRQ_GPIO9), +}; + static struct platform_device jornada_ts_device = { .name = "jornada_ts", .id = -1, + .num_resources = ARRAY_SIZE(jornada_ts_resources), + .resource = jornada_ts_resources, }; static struct platform_device *devices[] __initdata = { diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c index ea3b6a5b83e6..7e196f8e5661 100644 --- a/drivers/input/touchscreen/jornada720_ts.c +++ b/drivers/input/touchscreen/jornada720_ts.c @@ -22,7 +22,6 @@ #include #include -#include MODULE_AUTHOR("Kristoffer Ericson "); MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver"); @@ -101,7 +100,11 @@ static int jornada720_ts_probe(struct platform_device *pdev) { struct jornada_ts *jornada_ts; struct input_dev *input_dev; - int error; + int error, irq; + + irq = platform_get_irq(pdev, 0); + if (irq <= 0) + return irq < 0 ? irq : -EINVAL; jornada_ts = devm_kzalloc(&pdev->dev, sizeof(*jornada_ts), GFP_KERNEL); if (!jornada_ts) @@ -125,8 +128,7 @@ static int jornada720_ts_probe(struct platform_device *pdev) input_set_abs_params(input_dev, ABS_X, 270, 3900, 0, 0); input_set_abs_params(input_dev, ABS_Y, 180, 3700, 0, 0); - error = devm_request_irq(&pdev->dev, IRQ_GPIO9, - jornada720_ts_interrupt, + error = devm_request_irq(&pdev->dev, irq, jornada720_ts_interrupt, IRQF_TRIGGER_RISING, "HP7XX Touchscreen driver", pdev); if (error) {