From patchwork Wed Aug 8 12:54:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1295251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id D4855DF223 for ; Wed, 8 Aug 2012 12:59:10 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sz5nl-0001pF-L5; Wed, 08 Aug 2012 12:55:53 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sz5n3-0001VW-6K for linux-arm-kernel@lists.infradead.org; Wed, 08 Aug 2012 12:55:10 +0000 Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0M53xy-1Tx8hR2mPW-00yeri; Wed, 08 Aug 2012 14:55:00 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/6] ARM: pxa: remove irq_to_gpio from ezx-pcap driver Date: Wed, 8 Aug 2012 14:54:48 +0200 Message-Id: <1344430493-5304-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344430493-5304-1-git-send-email-arnd@arndb.de> References: <1344430493-5304-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:rqDk1oevhZFHpj2gCM/Ha8RZEpFEFCT2B0PpzKHlCuy lxMaD2Brq0P5Qe5Cz3ul1FSo5/NiR5ytr8XfU0Kw6Sqhg5vrUU fyxwfCM6pfE2KleIPJp2I0KkGlVOdsYWO97Qh8kY/6jwI5fM1N ZC8rdZE5nHCHVr6xOat4pkdCMc+ZhJh3nfzIzlMv8cfmSCdbAX QirQY0UFE9pLMcbZimxWin7s7P1Y6fE7I5mZ/NOQd724HTrocI y47er7DMntMPhUu+BrGZ2R5Tp1IYXgJZV1UHg+5CY0N4bE88eS fL/t+HVonfmiMcz/P6dDx81jhQH1KTMaL9Mps1AlvTNAtwMK8I 8lx1B8mRbxqA8RgJ6nnRIvb88KWl/ytSGr4Mt8xAV0uRK5ib6+ 9F+XxOCdSe8MQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Samuel Ortiz , Arnd Bergmann , linux-kernel@vger.kernel.org, "v3.2+" , arm@kernel.org, Haojian Zhuang , Daniel Ribeiro X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The irq_to_gpio function was removed from the pxa platform in linux-3.2, and this driver has been broken since. There is actually no in-tree user of this driver that adds this platform device, but the driver can and does get enabled on some platforms. Without this patch, building ezx_defconfig results in: drivers/mfd/ezx-pcap.c: In function 'pcap_isr_work': drivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] Signed-off-by: Arnd Bergmann Cc: stable@vger.kernel.org (v3.2+) Cc: Samuel Ortiz Cc: Daniel Ribeiro Cc: Haojian Zhuang Acked-by: Haojian Zhuang --- drivers/mfd/ezx-pcap.c | 2 +- include/linux/mfd/ezx-pcap.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 43a76c4..db662e2 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_struct *work) } local_irq_enable(); ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); - } while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); + } while (gpio_get_value(pdata->gpio)); } static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h index 40c37216..32a1b5c 100644 --- a/include/linux/mfd/ezx-pcap.h +++ b/include/linux/mfd/ezx-pcap.h @@ -16,6 +16,7 @@ struct pcap_subdev { struct pcap_platform_data { unsigned int irq_base; unsigned int config; + int gpio; void (*init) (void *); /* board specific init */ int num_subdevs; struct pcap_subdev *subdevs;