mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 16:22:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

iio: adc: rzg2l_adc: Convert dev_err() to dev_err_probe()

Browse Source 
Convert all occurrences of dev_err() in the probe path to dev_err_probe().
This improves readability and simplifies the code.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://patch.msgid.link/20241206111337.726244-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Claudiu Beznea
2024-12-06 13:13:24 +02:00
committed by Jonathan Cameron
parent a8ec0b44c7
commit a34dc289f8
1 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/iio/adc/rzg2l_adc.c
View File

@@ -313,15 +313,12 @@ static int rzg2l_adc_parse_properties(struct platform_device *pdev, struct rzg2l
return -ENOMEM;
num_channels = device_get_child_node_count(&pdev->dev);
if (!num_channels) {
dev_err(&pdev->dev, "no channel children\n");
return -ENODEV;
}
if (!num_channels)
return dev_err_probe(&pdev->dev, -ENODEV, "no channel children\n");
if (num_channels > RZG2L_ADC_MAX_CHANNELS) {
dev_err(&pdev->dev, "num of channel children out of range\n");
return -EINVAL;
}
if (num_channels > RZG2L_ADC_MAX_CHANNELS)
return dev_err_probe(&pdev->dev, -EINVAL,
"num of channel children out of range\n");
chan_array = devm_kcalloc(&pdev->dev, num_channels, sizeof(*chan_array),
GFP_KERNEL);
@@ -445,62 +442,51 @@ static int rzg2l_adc_probe(struct platform_device *pdev)
return PTR_ERR(adc->base);
adc->pclk = devm_clk_get(dev, "pclk");
if (IS_ERR(adc->pclk)) {
dev_err(dev, "Failed to get pclk");
return PTR_ERR(adc->pclk);
}
if (IS_ERR(adc->pclk))
return dev_err_probe(dev, PTR_ERR(adc->pclk),
"Failed to get pclk");
adc->adclk = devm_clk_get(dev, "adclk");
if (IS_ERR(adc->adclk)) {
dev_err(dev, "Failed to get adclk");
return PTR_ERR(adc->adclk);
}
if (IS_ERR(adc->adclk))
return dev_err_probe(dev, PTR_ERR(adc->adclk),
"Failed to get adclk");
adc->adrstn = devm_reset_control_get_exclusive(dev, "adrst-n");
if (IS_ERR(adc->adrstn)) {
dev_err(dev, "failed to get adrstn\n");
return PTR_ERR(adc->adrstn);
}
if (IS_ERR(adc->adrstn))
return dev_err_probe(dev, PTR_ERR(adc->adrstn),
"failed to get adrstn\n");
adc->presetn = devm_reset_control_get_exclusive(dev, "presetn");
if (IS_ERR(adc->presetn)) {
dev_err(dev, "failed to get presetn\n");
return PTR_ERR(adc->presetn);
}
if (IS_ERR(adc->presetn))
return dev_err_probe(dev, PTR_ERR(adc->presetn),
"failed to get presetn\n");
ret = reset_control_deassert(adc->adrstn);
if (ret) {
dev_err(&pdev->dev, "failed to deassert adrstn pin, %d\n", ret);
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"failed to deassert adrstn pin\n");
ret = devm_add_action_or_reset(&pdev->dev,
rzg2l_adc_reset_assert, adc->adrstn);
if (ret) {
dev_err(&pdev->dev, "failed to register adrstn assert devm action, %d\n",
ret);
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"failed to register adrstn assert devm action\n");
ret = reset_control_deassert(adc->presetn);
if (ret) {
dev_err(&pdev->dev, "failed to deassert presetn pin, %d\n", ret);
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"failed to deassert presetn pin\n");
ret = devm_add_action_or_reset(&pdev->dev,
rzg2l_adc_reset_assert, adc->presetn);
if (ret) {
dev_err(&pdev->dev, "failed to register presetn assert devm action, %d\n",
ret);
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"failed to register presetn assert devm action\n");
ret = rzg2l_adc_hw_init(adc);
if (ret) {
dev_err(&pdev->dev, "failed to initialize ADC HW, %d\n", ret);
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"failed to initialize ADC HW\n");
irq = platform_get_irq(pdev, 0);
if (irq < 0)