mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
iio: dac: mcp4922: drop remove() callback
By using devm_iio_device_register(), we can drop the remove() callback in the mcp4922 driver. We can also remove spi_set_drvdata() since there are no more callers of spi_get_drvdata(). Also use dev_err_probe() while we are at it. Signed-off-by: David Lechner <dlechner@baylibre.com> Link: https://patch.msgid.link/20240712-iio-regulator-refactor-round-3-v1-4-835017bae43d@baylibre.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
ba2b35841c
commit
f2e3fbc444
@ -138,7 +138,6 @@ static int mcp4922_probe(struct spi_device *spi)
|
||||
|
||||
state->vref_mv = ret / 1000;
|
||||
|
||||
spi_set_drvdata(spi, indio_dev);
|
||||
id = spi_get_device_id(spi);
|
||||
indio_dev->info = &mcp4922_info;
|
||||
indio_dev->modes = INDIO_DIRECT_MODE;
|
||||
@ -149,22 +148,13 @@ static int mcp4922_probe(struct spi_device *spi)
|
||||
indio_dev->num_channels = MCP4922_NUM_CHANNELS;
|
||||
indio_dev->name = id->name;
|
||||
|
||||
ret = iio_device_register(indio_dev);
|
||||
if (ret) {
|
||||
dev_err(&spi->dev, "Failed to register iio device: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
ret = devm_iio_device_register(&spi->dev, indio_dev);
|
||||
if (ret)
|
||||
return dev_err_probe(&spi->dev, ret, "Failed to register iio device\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mcp4922_remove(struct spi_device *spi)
|
||||
{
|
||||
struct iio_dev *indio_dev = spi_get_drvdata(spi);
|
||||
|
||||
iio_device_unregister(indio_dev);
|
||||
}
|
||||
|
||||
static const struct spi_device_id mcp4922_id[] = {
|
||||
{"mcp4902", ID_MCP4902},
|
||||
@ -180,7 +170,6 @@ static struct spi_driver mcp4922_driver = {
|
||||
.name = "mcp4922",
|
||||
},
|
||||
.probe = mcp4922_probe,
|
||||
.remove = mcp4922_remove,
|
||||
.id_table = mcp4922_id,
|
||||
};
|
||||
module_spi_driver(mcp4922_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user