[PATCH 1/3] staging:iio:magnetometer:ak8975 use platform_data to pass the gpio number.

Jonathan Cameron jic23 at cam.ac.uk
Tue Sep 20 09:06:37 UTC 2011


On 09/19/11 22:57, Stephen Warren wrote:
> From: Jonathan Cameron <jic23 at cam.ac.uk>
> 
> 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]

As I've stated elsewhere, this is the wrong fix for this particular driver,
but it is the one with minimal impact and as such I'm happy for it
to go in as a stop gap until someone has time (and hardware) to clean
this driver up to make 'correct' use of interrupts.  Note it's not going
to leave staging until that is done or someone explains why it can't be!
> 
> Signed-off-by: Jonathan Cameron <jic23 at cam.ac.uk>
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
Second one has some trivial one line fuzz against what I think is
the current state of Greg's tree - I'll push these on in the series I'll be
sending to Greg later today.  Obviously fine if Greg has already merged
them and fixed it up!

Thanks,

Jonathan
> ---
>  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 a17fa9f..6d17ae5 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 */




More information about the devel mailing list