以下的解决的办法 Received: by 10.180.24.165 with SMTP id v5mr1627194wif.1.1344895802661; Mon, 13 Aug 2012 15:10:02 -0700 (PDT) MIME-Version: 1.0 Path: q11ni115673333wiw.1!nntp.google.com!goblin2!goblin1!goblin3!goblin.stu.neva.ru!de-l.enfer-du-nord.net!feeder1.enfer-du-nord.net!news.musoftware.de!wum.musoftware.de!newsfeed.x-privat.org!bofh.it!news.nic.it!robomod From: Greg Kroah-Hartman <gre...@linuxfoundation.org> Newsgroups: linux.kernel Subject: [ 39/44] ARM: pxa: remove irq_to_gpio from ezx-pcap driver Date: Tue, 14 Aug 2012 00:10:02 +0200 Message-ID: <jyaZI-3W9-17@gated-at.bofh.it> References: <jyaZH-3W9-3@gated-at.bofh.it> X-Original-To: linux-ker...@vger.kernel.org, sta...@vger.kernel.org d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :user-agent:x-gm-message-state; bh=F06FiV3kky6Zg++lIhZCVjFUk2DMxYGhCP3vDnY85+Q=; b=ElrYdHczkk89CYPkJv4QIp7MX5YiuL9Fa8U7ca0XvN66Rx8UJMSBr8X3Z8lAwdiuwu R49WeGj/4HUYA/A9N1rSIeMOcvE8+CEQFIlMT/UIYeb/ubZw88Dvafvv37Wl9fn1ZMB3 xgmzAX2sg052HlhtGfzNlMgHIJ0C8C5+O0g9D/h1q4TNhijYsZsz2JDaqg2SPhBOlXyT OiR9zjB7cwsAyBTtFO3RUFyuCTMRXqKpaV2E0NnprxGhT9hqvqPB7GqoNaJ+QKV/dpGI WimEYMVjMkyYKprnpTJK87SOKr+ZfuLSbXeOA4aM7B/EXIyqSAmhH1SCcHHOonjFL5mJ yBfA== X-Mailer: git-send-email 1.7.10.1.362.g242cab3 User-Agent: quilt/0.60-20.5 X-Gm-Message-State: ALoCoQk1+oHZXeYJkWJX/MGPC6caJh1faIuqpP0JgaWgRvcL2jkTrzM9ij0xXHFlAXZ/0IiG00UU Sender: robo...@news.nic.it List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org Approved: robo...@news.nic.it Lines: 61 Organization: linux.* mail to news gateway X-Original-Cc: Greg KH <gre...@linuxfoundation.org>, torva...@linux-foundation.org, a...@linux-foundation.org, a...@lxorguk.ukuu.org.uk, Arnd Bergmann <a...@arndb.de>, Haojian Zhuang <haojian.zhu...@gmail.com>, Samuel Ortiz <sa...@linux.intel.com>, Daniel Ribeiro <drw...@gmail.com> X-Original-Date: Mon, 13 Aug 2012 15:02:46 -0700 X-Original-Message-ID: <20120813220145.596552...@linuxfoundation.org> X-Original-References: <20120813220142.113186...@linuxfoundation.org> X-Original-Sender: linux-kernel-ow...@vger.kernel.org From: Greg KH <gre...@linuxfoundation.org> 3.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann <a...@arndb.de> commit 59ee93a528b94ef4e81a08db252b0326feff171f upstream. 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 <a...@arndb.de> Acked-by: Haojian Zhuang <haojian.zhu...@gmail.com> Cc: Samuel Ortiz <sa...@linux.intel.com> Cc: Daniel Ribeiro <drw...@gmail.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/mfd/ezx-pcap.c | 2 +- include/linux/mfd/ezx-pcap.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_st } 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) --- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/