Skip to contentSkip to conversation

media: imx7-mipi-csis: Propagate the error if clock enabling fails

PATCH In review Fabio Estevam 2 participants 4 messages May 31, 2019 – Jun 3, 2019

Subsystems (4)
Media (V4L/DVB) Arm i.MX and Layerscape Staging Media drivers for Freescale i.MX
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/3 media: imx7-mipi-csis: Propagate the error if clock enabling fails

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 <[email protected]>
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/media/imx/imx7-mipi-csis.c +7 -7
index 042837b8ea28..1b538ae77364 100644
@@ -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);
Signature · 1 line
2.17.1
author reviewer
#1 lore raw

PATCH 2/3 media: imx7-mipi-csis: Remove unneeded 'ret' initialization

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 <[email protected]>
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +1 -1
index 1b538ae77364..acc9936dd075 100644
@@ -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)
Signature · 1 line
2.17.1
author reviewer
#2 lore raw

PATCH 3/3 media: imx7-mipi-csis: Remove extra blank line

In reply to Fabio Estevam

Checkpatch reports an extra blank line, so remove such unneeded line.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +0 -1
index acc9936dd075..d1cdf011c8f1 100644
@@ -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;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/3
#3 lore raw
In reply to Fabio Estevam

Oi Fabio,

Quoted 7 lines · 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 <[email protected]>

Thanks for the 3 patches. for all of them:

Reviewed-by Rui Miguel Silva <[email protected]>

---
Cheers,
Rui

Quoted 37 lines
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/media/imx/imx7-mipi-csis.c +7 -7
index 042837b8ea28..1b538ae77364 100644
@@ -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);