diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 10:15:59 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-27 00:31:54 (GMT) |
| commit | f6d838d7fecfd4e59a4ce7bdfb16165add36d26e (patch) | |
| tree | 257ff5b3e557f7336af2fa23511c8a933271407e /drivers/staging/iio/magnetometer | |
| parent | 6ddbb08af050948a7dda0fb5db6bf6bc01d54528 (diff) | |
| download | linux-f6d838d7fecfd4e59a4ce7bdfb16165add36d26e.tar.xz | |
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]
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/magnetometer')
| -rw-r--r-- | drivers/staging/iio/magnetometer/ak8975.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c index 0697ab3..0e66d3f 100644 --- a/drivers/staging/iio/magnetometer/ak8975.c +++ b/drivers/staging/iio/magnetometer/ak8975.c @@ -477,7 +477,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 */ |