summaryrefslogtreecommitdiff
path: root/include/linux/i2c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-12-06 01:10:28 -0800
committerLinus Walleij <linus.walleij@linaro.org>2012-12-07 09:16:12 +0100
commit805f864ebefc39065b6b0cf2548f13c2fbf888d9 (patch)
tree08250172d9e0685eea2f1d728a0f4a236acb88bd /include/linux/i2c
parent86605cfe8c7c166999bc7476b17940c68bf2f8b7 (diff)
downloadkernel-common-805f864ebefc39065b6b0cf2548f13c2fbf888d9.tar.gz
kernel-common-805f864ebefc39065b6b0cf2548f13c2fbf888d9.tar.bz2
kernel-common-805f864ebefc39065b6b0cf2548f13c2fbf888d9.zip
gpio: pcf857x: use client->irq for gpio_to_irq()
6e20a0a429bd4dc07d6de16d9c247270e04e4aa0 (gpio: pcf857x: enable gpio_to_irq() support) added gpio_to_irq() support on pcf857x driver, but it used pdata->irq. This patch modifies driver to use client->irq instead of it. It modifies kzm9g board platform settings, and device probe information too. This patch is tested on kzm9g board Reported-by: Christian Engelmayer <christian.engelmayer@frequentis.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/i2c')
-rw-r--r--include/linux/i2c/pcf857x.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/i2c/pcf857x.h b/include/linux/i2c/pcf857x.h
index 781e6bd06c34..0767a2a6b2f1 100644
--- a/include/linux/i2c/pcf857x.h
+++ b/include/linux/i2c/pcf857x.h
@@ -10,7 +10,6 @@
* @setup: optional callback issued once the GPIOs are valid
* @teardown: optional callback issued before the GPIOs are invalidated
* @context: optional parameter passed to setup() and teardown()
- * @irq: optional interrupt number
*
* In addition to the I2C_BOARD_INFO() state appropriate to each chip,
* the i2c_board_info used with the pcf875x driver must provide its
@@ -40,8 +39,6 @@ struct pcf857x_platform_data {
int gpio, unsigned ngpio,
void *context);
void *context;
-
- int irq;
};
#endif /* __LINUX_PCF857X_H */