* [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails
@ 2019-05-31 17:45 Fabio Estevam
2019-05-31 17:45 ` [PATCH 2/3] media: imx7-mipi-csis: Remove unneeded 'ret' initialization Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabio Estevam @ 2019-05-31 17:45 UTC (permalink / raw)
To: hverkuil-cisco; +Cc: rmfrfs, p.zabel, slongerbeam, linux-media, Fabio Estevam
Currently the return value from clk_bulk_prepare_enable() is checked,
but it is not propagate it in the case of failure.
Fix it and also move the error message to the caller of
mipi_csis_clk_enable().
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index 042837b8ea28..1b538ae77364 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -456,13 +456,9 @@ static void mipi_csis_set_params(struct csi_state *state)
MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW_CTRL);
}
-static void mipi_csis_clk_enable(struct csi_state *state)
+static int mipi_csis_clk_enable(struct csi_state *state)
{
- int ret;
-
- ret = clk_bulk_prepare_enable(state->num_clks, state->clks);
- if (ret < 0)
- dev_err(state->dev, "failed to enable clocks\n");
+ return clk_bulk_prepare_enable(state->num_clks, state->clks);
}
static void mipi_csis_clk_disable(struct csi_state *state)
@@ -989,7 +985,11 @@ static int mipi_csis_probe(struct platform_device *pdev)
if (ret < 0)
return ret;
- mipi_csis_clk_enable(state);
+ ret = mipi_csis_clk_enable(state);
+ if (ret < 0) {
+ dev_err(state->dev, "failed to enable clocks: %d\n", ret);
+ return ret;
+ }
ret = devm_request_irq(dev, state->irq, mipi_csis_irq_handler,
0, dev_name(dev), state);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] media: imx7-mipi-csis: Remove unneeded 'ret' initialization
2019-05-31 17:45 [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Fabio Estevam
@ 2019-05-31 17:45 ` Fabio Estevam
2019-05-31 17:45 ` [PATCH 3/3] media: imx7-mipi-csis: Remove extra blank line Fabio Estevam
2019-06-03 17:46 ` [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Rui Miguel Silva
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2019-05-31 17:45 UTC (permalink / raw)
To: hverkuil-cisco; +Cc: rmfrfs, p.zabel, slongerbeam, linux-media, Fabio Estevam
There is no need for initializing the 'ret' variable as it will
be assigned at:
ret = mipi_csis_parse_dt(pdev, state);
Remove the unneeded initialization.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-mipi-csis.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index 1b538ae77364..acc9936dd075 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -950,7 +950,7 @@ static int mipi_csis_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *mem_res;
struct csi_state *state;
- int ret = -ENOMEM;
+ int ret;
state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
if (!state)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] media: imx7-mipi-csis: Remove extra blank line
2019-05-31 17:45 [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Fabio Estevam
2019-05-31 17:45 ` [PATCH 2/3] media: imx7-mipi-csis: Remove unneeded 'ret' initialization Fabio Estevam
@ 2019-05-31 17:45 ` Fabio Estevam
2019-06-03 17:46 ` [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Rui Miguel Silva
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2019-05-31 17:45 UTC (permalink / raw)
To: hverkuil-cisco; +Cc: rmfrfs, p.zabel, slongerbeam, linux-media, Fabio Estevam
Checkpatch reports an extra blank line, so remove such unneeded
line.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-mipi-csis.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index acc9936dd075..d1cdf011c8f1 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -902,7 +902,6 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd,
return ret;
}
-
static int mipi_csis_dump_regs_show(struct seq_file *m, void *private)
{
struct csi_state *state = m->private;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails
2019-05-31 17:45 [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Fabio Estevam
2019-05-31 17:45 ` [PATCH 2/3] media: imx7-mipi-csis: Remove unneeded 'ret' initialization Fabio Estevam
2019-05-31 17:45 ` [PATCH 3/3] media: imx7-mipi-csis: Remove extra blank line Fabio Estevam
@ 2019-06-03 17:46 ` Rui Miguel Silva
2 siblings, 0 replies; 4+ messages in thread
From: Rui Miguel Silva @ 2019-06-03 17:46 UTC (permalink / raw)
To: Fabio Estevam; +Cc: hverkuil-cisco, p.zabel, slongerbeam, linux-media
Oi Fabio,
On Fri 31 May 2019 at 18:45, Fabio Estevam wrote:
> Currently the return value from clk_bulk_prepare_enable() is checked,
> but it is not propagate it in the case of failure.
>
> Fix it and also move the error message to the caller of
> mipi_csis_clk_enable().
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Thanks for the 3 patches. for all of them:
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
---
Cheers,
Rui
> ---
> drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
> index 042837b8ea28..1b538ae77364 100644
> --- a/drivers/staging/media/imx/imx7-mipi-csis.c
> +++ b/drivers/staging/media/imx/imx7-mipi-csis.c
> @@ -456,13 +456,9 @@ static void mipi_csis_set_params(struct csi_state *state)
> MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW_CTRL);
> }
>
> -static void mipi_csis_clk_enable(struct csi_state *state)
> +static int mipi_csis_clk_enable(struct csi_state *state)
> {
> - int ret;
> -
> - ret = clk_bulk_prepare_enable(state->num_clks, state->clks);
> - if (ret < 0)
> - dev_err(state->dev, "failed to enable clocks\n");
> + return clk_bulk_prepare_enable(state->num_clks, state->clks);
> }
>
> static void mipi_csis_clk_disable(struct csi_state *state)
> @@ -989,7 +985,11 @@ static int mipi_csis_probe(struct platform_device *pdev)
> if (ret < 0)
> return ret;
>
> - mipi_csis_clk_enable(state);
> + ret = mipi_csis_clk_enable(state);
> + if (ret < 0) {
> + dev_err(state->dev, "failed to enable clocks: %d\n", ret);
> + return ret;
> + }
>
> ret = devm_request_irq(dev, state->irq, mipi_csis_irq_handler,
> 0, dev_name(dev), state);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-03 17:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 17:45 [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Fabio Estevam
2019-05-31 17:45 ` [PATCH 2/3] media: imx7-mipi-csis: Remove unneeded 'ret' initialization Fabio Estevam
2019-05-31 17:45 ` [PATCH 3/3] media: imx7-mipi-csis: Remove extra blank line Fabio Estevam
2019-06-03 17:46 ` [PATCH 1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails Rui Miguel Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).