Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964773Ab2HHMzH (ORCPT ); Wed, 8 Aug 2012 08:55:07 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:49613 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753563Ab2HHMzC (ORCPT ); Wed, 8 Aug 2012 08:55:02 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , stable@vger.kernel.org (v3.2+), Samuel Ortiz , Daniel Ribeiro , Haojian Zhuang 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== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1959 Lines: 55 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 --- 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; -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/