[PATCH v6 4/6] iio: dac: ad5504: remove legacy platform data support
Taha Ed-Dafili <[email protected]>
| Newsgroups | org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
The AD5504 driver has no in-tree users of its legacy platform data support. Now that ACPI has its own explicit path, non-ACPI systems can safely treat the vcc regulator as mandatory. Drop the ad5504_platform_data structure, remove the fallback logic from probe, and delete include/linux/iio/dac/ad5504.h. Signed-off-by: Taha Ed-Dafili <[email protected]> --- drivers/iio/dac/ad5504.c | 17 +++++------------ include/linux/iio/dac/ad5504.h | 15 --------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 include/linux/iio/dac/ad5504.h diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 6f70c57c7a82..799726eafdf2 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c @@ -20,7 +20,6 @@ #include <linux/types.h> #include <linux/units.h> -#include <linux/iio/dac/ad5504.h> #include <linux/iio/events.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -281,7 +280,6 @@ static const struct iio_chan_spec ad5504_channels[] = { static int ad5504_probe(struct spi_device *spi) { struct device *dev = &spi->dev; - const struct ad5504_platform_data *pdata = dev_get_platdata(dev); struct iio_dev *indio_dev; struct ad5504_state *st; int ret; @@ -296,16 +294,11 @@ static int ad5504_probe(struct spi_device *spi) st->vref_mv = AD5504_VREF_ACPI_DEFAULT_mV; } else { ret = devm_regulator_get_enable_read_voltage(dev, "vcc"); - if (ret < 0 && ret != -ENODEV) - return ret; - if (ret == -ENODEV) { - if (pdata->vref_mv) - st->vref_mv = pdata->vref_mv; - else - dev_warn(dev, "reference voltage unspecified\n"); - } else { - st->vref_mv = ret / 1000; - } + if (ret < 0) + return dev_err_probe(dev, ret, + "Failed to get vcc regulator\n"); + + st->vref_mv = ret / 1000; } st->spi = spi; diff --git a/include/linux/iio/dac/ad5504.h b/include/linux/iio/dac/ad5504.h deleted file mode 100644 index 9f23c90486ee..000000000000 --- a/include/linux/iio/dac/ad5504.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * AD5504 SPI DAC driver - * - * Copyright 2011 Analog Devices Inc. - */ - -#ifndef SPI_AD5504_H_ -#define SPI_AD5504_H_ - -struct ad5504_platform_data { - u16 vref_mv; -}; - -#endif /* SPI_AD5504_H_ */ -- 2.55.0