Commit 7c6c9368 authored by Stephen Warren's avatar Stephen Warren Committed by Greg Kroah-Hartman
Browse files

staging:iio:magnetometer:ak8975: Don't assume 0 is an invalid GPIO 



gpio_is_valid() is the defined mechanism to determine whether a GPIO is
valid. Use this instead of assuming that 0 is an invalid GPIO.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarAndrew Chew <achew@nvidia.com>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f6d838d7

drivers/staging/iio/magnetometer/ak8975.c

+5 −6
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) 
	}



	/* Wait for the conversion to complete. */

	if (data->eoc_gpio)

	if (gpio_is_valid(data->eoc_gpio))

		ret = wait_conversion_complete_gpio(data);

	else

		ret = wait_conversion_complete_polled(data);
@@ -484,7 +484,7 @@ static int ak8975_probe(struct i2c_client *client, 


	/* We may not have a GPIO based IRQ to scan, that is fine, we will

	   poll if so */

	if (eoc_gpio > 0) {

	if (gpio_is_valid(eoc_gpio)) {

		err = gpio_request(eoc_gpio, "ak_8975");

		if (err < 0) {

			dev_err(&client->dev,
@@ -500,8 +500,7 @@ static int ak8975_probe(struct i2c_client *client, 
						eoc_gpio, err);

			goto exit_gpio;

		}

	} else

		eoc_gpio = 0;	/* No GPIO available */

	}



	/* Register with IIO */

	indio_dev = iio_allocate_device(sizeof(*data));
@@ -537,7 +536,7 @@ static int ak8975_probe(struct i2c_client *client, 
exit_free_iio:

	iio_free_device(indio_dev);

exit_gpio:

	if (eoc_gpio)

	if (gpio_is_valid(eoc_gpio))

		gpio_free(eoc_gpio);

exit:

	return err;
@@ -551,7 +550,7 @@ static int ak8975_remove(struct i2c_client *client) 


	iio_device_unregister(indio_dev);



	if (eoc_gpio)

	if (gpio_is_valid(eoc_gpio))

		gpio_free(eoc_gpio);



	return 0;