]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging:iio:magnetometer:ak8975 use platform_data to pass the gpio number.
authorJonathan Cameron <jic23@cam.ac.uk>
Wed, 21 Sep 2011 10:15:59 +0000 (11:15 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 27 Sep 2011 00:31:54 +0000 (17:31 -0700)
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>
drivers/staging/iio/magnetometer/ak8975.c

index 0697ab3c422f2c27074cae33b56c0d6e7e16eabc..0e66d3f080b04b28110cbaa63cc9636443761f43 100644 (file)
@@ -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 */