leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: accel: bma220: convert probe to device-managed functions

Browse Source 
This change converts the driver to use devm_iio_triggered_buffer_setup()
and devm_iio_device_register() for initializing and registering the IIO
device.

The bma220_deinit() is converted into a callback for a
devm_add_action_or_reset() hook, so that the device is put in stand-by when
the driver gets uninitialized.
The return value of the bma220_deinit() function isn't used as it does not
add any value. On the error path of the probe function, this can just
override the actual error with -EBUSY, or can even return 0 (no error), on
the error path.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210625140137.362282-1-aardelean@deviqon.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Alexandru Ardelean 2021-06-25 17:01:36 +03:00 committed by Jonathan Cameron
parent f21a5f7215
commit c336b611e9
1 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/iio/accel/bma220_spi.c
View File

@ -218,20 +218,14 @@ static int bma220_init(struct spi_device *spi)
return 0; return 0;
} }
static int bma220_deinit(struct spi_device *spi) static void bma220_deinit(void *spi)
{ {
int ret; int ret;
/* Make sure the chip is powered off */ /* Make sure the chip is powered off */
ret = bma220_read_reg(spi, BMA220_REG_SUSPEND); ret = bma220_read_reg(spi, BMA220_REG_SUSPEND);
if (ret == BMA220_SUSPEND_SLEEP) if (ret == BMA220_SUSPEND_SLEEP)
ret = bma220_read_reg(spi, BMA220_REG_SUSPEND); bma220_read_reg(spi, BMA220_REG_SUSPEND);
if (ret < 0)
return ret;
if (ret == BMA220_SUSPEND_SLEEP)
return -EBUSY;
return 0;
} }
static int bma220_probe(struct spi_device *spi) static int bma220_probe(struct spi_device *spi)
@ -262,34 +256,19 @@ static int bma220_probe(struct spi_device *spi)
if (ret) if (ret)
return ret; return ret;
ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time, ret = devm_add_action_or_reset(&spi->dev, bma220_deinit, spi);
if (ret)
return ret;
ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
iio_pollfunc_store_time,
bma220_trigger_handler, NULL); bma220_trigger_handler, NULL);
if (ret < 0) { if (ret < 0) {
dev_err(&spi->dev, "iio triggered buffer setup failed\n"); dev_err(&spi->dev, "iio triggered buffer setup failed\n");
goto err_suspend; return ret;
} }
ret = iio_device_register(indio_dev); return devm_iio_device_register(&spi->dev, indio_dev);
if (ret < 0) {
dev_err(&spi->dev, "iio_device_register failed\n");
iio_triggered_buffer_cleanup(indio_dev);
goto err_suspend;
}
return 0;
err_suspend:
return bma220_deinit(spi);
}
static int bma220_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev);
return bma220_deinit(spi);
} }
static __maybe_unused int bma220_suspend(struct device *dev) static __maybe_unused int bma220_suspend(struct device *dev)
@ -326,7 +305,6 @@ static struct spi_driver bma220_driver = {
.acpi_match_table = bma220_acpi_id, .acpi_match_table = bma220_acpi_id,
}, },
.probe = bma220_probe, .probe = bma220_probe,
.remove = bma220_remove,
.id_table = bma220_spi_id, .id_table = bma220_spi_id,
}; };
module_spi_driver(bma220_driver); module_spi_driver(bma220_driver);