media: stm32-dcmi: return appropriate error codes during probe
Commit Message
During probe, return the provided errors value instead of -ENODEV.
This allows the driver to be deferred probed if needed.
Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
---
drivers/media/platform/stm32/stm32-dcmi.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
Comments
Acked-by: Hugues Fruchet <hugues.fruchet@st.com>
On 4/24/19 3:25 PM, Fabien Dessenne wrote:
> During probe, return the provided errors value instead of -ENODEV.
> This allows the driver to be deferred probed if needed.
>
> Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
> ---
> drivers/media/platform/stm32/stm32-dcmi.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
> index 906e71b..b9dad0a 100644
> --- a/drivers/media/platform/stm32/stm32-dcmi.c
> +++ b/drivers/media/platform/stm32/stm32-dcmi.c
> @@ -1672,7 +1672,7 @@ static int dcmi_probe(struct platform_device *pdev)
> dcmi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
> if (IS_ERR(dcmi->rstc)) {
> dev_err(&pdev->dev, "Could not get reset control\n");
> - return -ENODEV;
> + return PTR_ERR(dcmi->rstc);
> }
>
> /* Get bus characteristics from devicetree */
> @@ -1687,7 +1687,7 @@ static int dcmi_probe(struct platform_device *pdev)
> of_node_put(np);
> if (ret) {
> dev_err(&pdev->dev, "Could not parse the endpoint\n");
> - return -ENODEV;
> + return ret;
> }
>
> if (ep.bus_type == V4L2_MBUS_CSI2_DPHY) {
> @@ -1700,8 +1700,9 @@ static int dcmi_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq <= 0) {
> - dev_err(&pdev->dev, "Could not get irq\n");
> - return -ENODEV;
> + if (irq != -EPROBE_DEFER)
> + dev_err(&pdev->dev, "Could not get irq\n");
> + return irq;
> }
>
> dcmi->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> @@ -1721,12 +1722,13 @@ static int dcmi_probe(struct platform_device *pdev)
> dev_name(&pdev->dev), dcmi);
> if (ret) {
> dev_err(&pdev->dev, "Unable to request irq %d\n", irq);
> - return -ENODEV;
> + return ret;
> }
>
> mclk = devm_clk_get(&pdev->dev, "mclk");
> if (IS_ERR(mclk)) {
> - dev_err(&pdev->dev, "Unable to get mclk\n");
> + if (PTR_ERR(mclk) != -EPROBE_DEFER)
> + dev_err(&pdev->dev, "Unable to get mclk\n");
> return PTR_ERR(mclk);
> }
>
>
@@ -1672,7 +1672,7 @@ static int dcmi_probe(struct platform_device *pdev)
dcmi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
if (IS_ERR(dcmi->rstc)) {
dev_err(&pdev->dev, "Could not get reset control\n");
- return -ENODEV;
+ return PTR_ERR(dcmi->rstc);
}
/* Get bus characteristics from devicetree */
@@ -1687,7 +1687,7 @@ static int dcmi_probe(struct platform_device *pdev)
of_node_put(np);
if (ret) {
dev_err(&pdev->dev, "Could not parse the endpoint\n");
- return -ENODEV;
+ return ret;
}
if (ep.bus_type == V4L2_MBUS_CSI2_DPHY) {
@@ -1700,8 +1700,9 @@ static int dcmi_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (irq <= 0) {
- dev_err(&pdev->dev, "Could not get irq\n");
- return -ENODEV;
+ if (irq != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "Could not get irq\n");
+ return irq;
}
dcmi->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1721,12 +1722,13 @@ static int dcmi_probe(struct platform_device *pdev)
dev_name(&pdev->dev), dcmi);
if (ret) {
dev_err(&pdev->dev, "Unable to request irq %d\n", irq);
- return -ENODEV;
+ return ret;
}
mclk = devm_clk_get(&pdev->dev, "mclk");
if (IS_ERR(mclk)) {
- dev_err(&pdev->dev, "Unable to get mclk\n");
+ if (PTR_ERR(mclk) != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "Unable to get mclk\n");
return PTR_ERR(mclk);
}