Skip to content

Commit

Permalink
iio: adc: max1027: Use device-managed APIs
Browse files Browse the repository at this point in the history
Use device-managed APIs to simplify the code.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  • Loading branch information
Chuhong Yuan authored and Jonathan Cameron committed Aug 18, 2019
1 parent b311da8 commit 2715a28
Showing 1 changed file with 7 additions and 31 deletions.
38 changes: 7 additions & 31 deletions drivers/iio/adc/max1027.c
Original file line number Diff line number Diff line change
@@ -427,8 +427,9 @@ static int max1027_probe(struct spi_device *spi)
return -ENOMEM;
}

ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
&max1027_trigger_handler, NULL);
ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
&iio_pollfunc_store_time,
&max1027_trigger_handler, NULL);
if (ret < 0) {
dev_err(&indio_dev->dev, "Failed to setup buffer\n");
return ret;
@@ -439,7 +440,7 @@ static int max1027_probe(struct spi_device *spi)
if (st->trig == NULL) {
ret = -ENOMEM;
dev_err(&indio_dev->dev, "Failed to allocate iio trigger\n");
goto fail_trigger_alloc;
return ret;
}

st->trig->ops = &max1027_trigger_ops;
@@ -454,42 +455,18 @@ static int max1027_probe(struct spi_device *spi)
spi->dev.driver->name, st->trig);
if (ret < 0) {
dev_err(&indio_dev->dev, "Failed to allocate IRQ.\n");
goto fail_dev_register;
return ret;
}

/* Disable averaging */
st->reg = MAX1027_AVG_REG;
ret = spi_write(st->spi, &st->reg, 1);
if (ret < 0) {
dev_err(&indio_dev->dev, "Failed to configure averaging register\n");
goto fail_dev_register;
}

ret = iio_device_register(indio_dev);
if (ret < 0) {
dev_err(&indio_dev->dev, "Failed to register iio device\n");
goto fail_dev_register;
return ret;
}

return 0;

fail_dev_register:
fail_trigger_alloc:
iio_triggered_buffer_cleanup(indio_dev);

return ret;
}

static int max1027_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);

pr_debug("%s: remove(spi = 0x%p)\n", __func__, spi);

iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev);

return 0;
return devm_iio_device_register(&spi->dev, indio_dev);
}

static struct spi_driver max1027_driver = {
@@ -498,7 +475,6 @@ static struct spi_driver max1027_driver = {
.of_match_table = of_match_ptr(max1027_adc_dt_ids),
},
.probe = max1027_probe,
.remove = max1027_remove,
.id_table = max1027_id,
};
module_spi_driver(max1027_driver);

0 comments on commit 2715a28

Please sign in to comment.