Skip to content

Commit

Permalink
ARM: pxa: remove irq_to_gpio from ezx-pcap driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed Aug 9, 2012
1 parent 798bd59 commit 59ee93a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mfd/ezx-pcap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions include/linux/mfd/ezx-pcap.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 59ee93a

Please sign in to comment.