Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59ee93a5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHaojian 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>
parent 798bd59c

drivers/mfd/ezx-pcap.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/mfd/ezx-pcap.h

+1 −0
Original line number Diff line number Diff line
@@ -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;