Commit ec25bb6e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: adc: meson_saradc: Don't attach managed resource to IIO device object 



It feels wrong and actually inconsistent to attach managed resources
to the IIO device object, which is child of the physical device object.
The rest of the ->probe() calls do that against physical device.

Resolve this by reassigning managed resources to the physical device object.

Suggested-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20220603100004.70336-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 5a3ec28a

drivers/iio/adc/meson_saradc.c

+5 −7
Original line number Diff line number Diff line
@@ -650,11 +650,11 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, 
				  void __iomem *base)

{

	struct meson_sar_adc_priv *priv = iio_priv(indio_dev);

	struct device *dev = indio_dev->dev.parent;

	struct clk_init_data init;

	const char *clk_parents[1];



	init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_div",

				   dev_name(indio_dev->dev.parent));

	init.name = devm_kasprintf(dev, GFP_KERNEL, "%s#adc_div", dev_name(dev));

	if (!init.name)

		return -ENOMEM;
@@ -670,13 +670,11 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, 
	priv->clk_div.hw.init = &init;

	priv->clk_div.flags = 0;



	priv->adc_div_clk = devm_clk_register(&indio_dev->dev,

					      &priv->clk_div.hw);

	priv->adc_div_clk = devm_clk_register(dev, &priv->clk_div.hw);

	if (WARN_ON(IS_ERR(priv->adc_div_clk)))

		return PTR_ERR(priv->adc_div_clk);



	init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_en",

				   dev_name(indio_dev->dev.parent));

	init.name = devm_kasprintf(dev, GFP_KERNEL, "%s#adc_en", dev_name(dev));

	if (!init.name)

		return -ENOMEM;
@@ -690,7 +688,7 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, 
	priv->clk_gate.bit_idx = __ffs(MESON_SAR_ADC_REG3_CLK_EN);

	priv->clk_gate.hw.init = &init;



	priv->adc_clk = devm_clk_register(&indio_dev->dev, &priv->clk_gate.hw);

	priv->adc_clk = devm_clk_register(dev, &priv->clk_gate.hw);

	if (WARN_ON(IS_ERR(priv->adc_clk)))

		return PTR_ERR(priv->adc_clk);