From ab7b32a5b1614e12877a0328d2bb250320d9d617 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 21 Sep 2011 11:15:59 +0100 Subject: staging:iio:magnetometer:ak8975 use platform_data to pass the gpio number. Tegra doesn't have irq_to_gpio() any more, and ak8975 is included in tegra_defconfig. This causes a build failure. Instead, pass the GPIO name through platform data. [swarren: Rewrote commit description when I squashed this with my patch to remove the irq_to_gpio() call] Upstream v3.2 commit f6d838d7fecfd4e59a4ce7bdfb16165add36d26e Change-Id: I6bd269aa8c0ff8165078ff67e4cbcfdde936c20d Signed-off-by: Jonathan Cameron Signed-off-by: Stephen Warren Signed-off-by: Greg Kroah-Hartman Signed-off-by: Dan Willemsen Reviewed-on: http://git-master/r/83530 Reviewed-by: Andrew Chew Reviewed-by: Allen Martin --- drivers/staging/iio/magnetometer/ak8975.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c index c3481a560375..d8c65c08a564 100644 --- a/drivers/staging/iio/magnetometer/ak8975.c +++ b/drivers/staging/iio/magnetometer/ak8975.c @@ -487,7 +487,10 @@ static int ak8975_probe(struct i2c_client *client, int err; /* Grab and set up the supplied GPIO. */ - eoc_gpio = irq_to_gpio(client->irq); + if (client->dev.platform_data == NULL) + eoc_gpio = -1; + else + eoc_gpio = *(int *)(client->dev.platform_data); /* We may not have a GPIO based IRQ to scan, that is fine, we will poll if so */ -- cgit v1.2.3