From: Hugues FRUCHET <hugues.fruchet@st.com>
To: Fabien DESSENNE <fabien.dessenne@st.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
"Alexandre TORGUE" <alexandre.torgue@st.com>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
"linux-stm32@st-md-mailman.stormreply.com"
<linux-stm32@st-md-mailman.stormreply.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] media: stm32-dcmi: return appropriate error codes during probe
Date: Wed, 24 Apr 2019 15:58:42 +0000 [thread overview]
Message-ID: <474f02b3-33e9-5df5-7344-91fdb84507b0@st.com> (raw)
In-Reply-To: <1556112344-15305-1-git-send-email-fabien.dessenne@st.com>
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);
> }
>
>
prev parent reply other threads:[~2019-04-24 15:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 13:25 Fabien Dessenne
2019-04-24 15:58 ` Hugues FRUCHET [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=474f02b3-33e9-5df5-7344-91fdb84507b0@st.com \
--to=hugues.fruchet@st.com \
--cc=alexandre.torgue@st.com \
--cc=fabien.dessenne@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mchehab@kernel.org \
--cc=mcoquelin.stm32@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®