Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: pxa: remove irq_to_gpio from ezx-pcap driver

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 <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: stable@vger.kernel.org (v3.2+)
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Daniel Ribeiro <drwyrm@gmail.com>

+2 -1
+1 -1
drivers/mfd/ezx-pcap.c
··· 202 202 } 203 203 local_irq_enable(); 204 204 ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); 205 - } while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); 205 + } while (gpio_get_value(pdata->gpio)); 206 206 } 207 207 208 208 static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
+1
include/linux/mfd/ezx-pcap.h
··· 16 16 struct pcap_platform_data { 17 17 unsigned int irq_base; 18 18 unsigned int config; 19 + int gpio; 19 20 void (*init) (void *); /* board specific init */ 20 21 int num_subdevs; 21 22 struct pcap_subdev *subdevs;