Commit a2d518fb authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Jonathan Cameron
Browse files

iio: adc: mt6577_auxadc: Simplify with device managed function 



Add a device managed hook, via devm_add_action_or_reset() and
mt6577_power_off(), to power off on device detach.

Replace iio_device_register() by devm_iio_device_register() and remove
the mt6577_auxadc_remove() function used to unregister the device and
power off the device.

Remove platform_set_drvdata() from the probe function, since
platform_get_drvdata() is not used anymore.

Remove mt6577_auxadc_mod_reg() call from the probe function error path.

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230826035402.3512033-3-ruanjinjie@huawei.com


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

drivers/iio/adc/mt6577_auxadc.c

+15 −25
Original line number Diff line number Diff line
@@ -246,6 +246,14 @@ static int mt6577_auxadc_suspend(struct device *dev) 
	return 0;

}



static void mt6577_power_off(void *data)

{

	struct mt6577_auxadc_device *adc_dev = data;



	mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,

			      0, MT6577_AUXADC_PDN_EN);

}



static int mt6577_auxadc_probe(struct platform_device *pdev)

{

	struct mt6577_auxadc_device *adc_dev;
@@ -286,31 +294,14 @@ static int mt6577_auxadc_probe(struct platform_device *pdev) 
			      MT6577_AUXADC_PDN_EN, 0);

	mdelay(MT6577_AUXADC_POWER_READY_MS);



	platform_set_drvdata(pdev, indio_dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to register iio device\n");

		goto err_power_off;

	}



	return 0;



err_power_off:

	mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,

			      0, MT6577_AUXADC_PDN_EN);

	return ret;

}

	ret = devm_add_action_or_reset(&pdev->dev, mt6577_power_off, adc_dev);

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "Failed to add action to managed power off\n");



static int mt6577_auxadc_remove(struct platform_device *pdev)

{

	struct iio_dev *indio_dev = platform_get_drvdata(pdev);

	struct mt6577_auxadc_device *adc_dev = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);



	mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,

			      0, MT6577_AUXADC_PDN_EN);

	ret = devm_iio_device_register(&pdev->dev, indio_dev);

	if (ret < 0)

		return dev_err_probe(&pdev->dev, ret, "failed to register iio device\n");



	return 0;

}
@@ -337,7 +328,6 @@ static struct platform_driver mt6577_auxadc_driver = { 
		.pm = pm_sleep_ptr(&mt6577_auxadc_pm_ops),

	},

	.probe	= mt6577_auxadc_probe,

	.remove	= mt6577_auxadc_remove,

};

module_platform_driver(mt6577_auxadc_driver);