UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: adc: lpc18xx_adc: Convert probe to device managed version 

The remove function and the goto sections are not necessary if devm
functions are used.

Convert device register to devm version. Add hook functions to release
device resources, and use them inside probe with devm_add_action,
which will release resources on driver detach.

To maintain the order of which device resources were released/reseted,
register the hook functions as soon as resources are obtained/initialized.
Since devres actions are called on driver detach, the remove
function and the error-handling goto sections are no longer necessary.

Signed-off-by: André Gustavo Nakagomi Lopez <andregnl@usp.br>
Link: https://lore.kernel.org/r/YWnMsGlc/I35gYvy@Andryuu.br
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
André Gustavo Nakagomi Lopez 2021-10-15 15:47:12 -03:00 committed by Jonathan Cameron
parent 26fa68c1d7
commit 0be844470e
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/iio/adc/lpc18xx_adc.c
View File

@ -115,6 +115,23 @@ static const struct iio_info lpc18xx_adc_info = {
.read_raw = lpc18xx_adc_read_raw, .read_raw = lpc18xx_adc_read_raw,
}; };
static void lpc18xx_clear_cr_reg(void *data)
{
struct lpc18xx_adc *adc = data;
writel(0, adc->base + LPC18XX_ADC_CR);
}
static void lpc18xx_clk_disable(void *clk)
{
clk_disable_unprepare(clk);
}
static void lpc18xx_regulator_disable(void *vref)
{
regulator_disable(vref);
}
static int lpc18xx_adc_probe(struct platform_device *pdev) static int lpc18xx_adc_probe(struct platform_device *pdev)
{ {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
@ -127,7 +144,6 @@ static int lpc18xx_adc_probe(struct platform_device *pdev)
if (!indio_dev) if (!indio_dev)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, indio_dev);
adc = iio_priv(indio_dev); adc = iio_priv(indio_dev);
adc->dev = &pdev->dev; adc->dev = &pdev->dev;
mutex_init(&adc->lock); mutex_init(&adc->lock);
@ -163,44 +179,30 @@ static int lpc18xx_adc_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = devm_add_action_or_reset(&pdev->dev, lpc18xx_regulator_disable, adc->vref);
if (ret)
return ret;
ret = clk_prepare_enable(adc->clk); ret = clk_prepare_enable(adc->clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to enable clock\n"); dev_err(&pdev->dev, "unable to enable clock\n");
goto dis_reg; return ret;
} }
ret = devm_add_action_or_reset(&pdev->dev, lpc18xx_clk_disable,
adc->clk);
if (ret)
return ret;
adc->cr_reg = (clkdiv << LPC18XX_ADC_CR_CLKDIV_SHIFT) | adc->cr_reg = (clkdiv << LPC18XX_ADC_CR_CLKDIV_SHIFT) |
LPC18XX_ADC_CR_PDN; LPC18XX_ADC_CR_PDN;
writel(adc->cr_reg, adc->base + LPC18XX_ADC_CR); writel(adc->cr_reg, adc->base + LPC18XX_ADC_CR);
ret = iio_device_register(indio_dev); ret = devm_add_action_or_reset(&pdev->dev, lpc18xx_clear_cr_reg, adc);
if (ret) { if (ret)
dev_err(&pdev->dev, "unable to register device\n"); return ret;
goto dis_clk;
}
return 0; return devm_iio_device_register(&pdev->dev, indio_dev);
dis_clk:
writel(0, adc->base + LPC18XX_ADC_CR);
clk_disable_unprepare(adc->clk);
dis_reg:
regulator_disable(adc->vref);
return ret;
}
static int lpc18xx_adc_remove(struct platform_device *pdev)
{
struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct lpc18xx_adc *adc = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
writel(0, adc->base + LPC18XX_ADC_CR);
clk_disable_unprepare(adc->clk);
regulator_disable(adc->vref);
return 0;
} }
static const struct of_device_id lpc18xx_adc_match[] = { static const struct of_device_id lpc18xx_adc_match[] = {
@ -211,7 +213,6 @@ MODULE_DEVICE_TABLE(of, lpc18xx_adc_match);
static struct platform_driver lpc18xx_adc_driver = { static struct platform_driver lpc18xx_adc_driver = {
.probe = lpc18xx_adc_probe, .probe = lpc18xx_adc_probe,
.remove = lpc18xx_adc_remove,
.driver = { .driver = {
.name = "lpc18xx-adc", .name = "lpc18xx-adc",
.of_match_table = lpc18xx_adc_match, .of_match_table = lpc18xx_adc_match,