Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d1b0b48 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

staging: iio: ad2s1200: Use devm_* APIs 



devm_* APIs are device managed and make code simpler.
This patch also fixes the missing gpio_free call in remove.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Graff Yang <graff.yang@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 9e4904c1

drivers/staging/iio/resolver/ad2s1200.c

+8 −16
Original line number Diff line number Diff line
@@ -107,16 +107,16 @@ static int ad2s1200_probe(struct spi_device *spi) 
	unsigned short *pins = spi->dev.platform_data;



	for (pn = 0; pn < AD2S1200_PN; pn++)

		if (gpio_request_one(pins[pn], GPIOF_DIR_OUT, DRV_NAME)) {

		ret = devm_gpio_request_one(&spi->dev, pins[pn], GPIOF_DIR_OUT,

					    DRV_NAME);

		if (ret) {

			pr_err("%s: request gpio pin %d failed\n",

						DRV_NAME, pins[pn]);

			goto error_ret;

		}

	indio_dev = iio_device_alloc(sizeof(*st));

	if (indio_dev == NULL) {

		ret = -ENOMEM;

		goto error_ret;

			return ret;

		}

	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (!indio_dev)

		return -ENOMEM;

	spi_set_drvdata(spi, indio_dev);

	st = iio_priv(indio_dev);

	mutex_init(&st->lock);
@@ -133,26 +133,18 @@ static int ad2s1200_probe(struct spi_device *spi) 


	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_free_dev;

		return ret;



	spi->max_speed_hz = AD2S1200_HZ;

	spi->mode = SPI_MODE_3;

	spi_setup(spi);



	return 0;



error_free_dev:

	iio_device_free(indio_dev);

error_ret:

	for (--pn; pn >= 0; pn--)

		gpio_free(pins[pn]);

	return ret;

}



static int ad2s1200_remove(struct spi_device *spi)

{

	iio_device_unregister(spi_get_drvdata(spi));

	iio_device_free(spi_get_drvdata(spi));



	return 0;

}