| Message ID | 62c0aef8d3b86d8f290bf6787f1b2b41efbb0b55.1659295329.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe() | expand |
Hi Christophe, On Sun 31 Jul 22, 21:22, Christophe JAILLET wrote: > Release some resources in the error handling path of the probe and of > sun8i_a83t_mipi_csi2_resources_setup(), as already done in the remove > function. Great finds, thanks! Just some nitpick about the label names to make them consistent with other labels (also from the sun6i-csi rework). > Fixes: 576d196c522b ("media: sunxi: Add support for the A83T MIPI CSI-2 controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > I'm unsure about the phy_exit() call in > sun8i_a83t_mipi_csi2_resources_cleanup() because no explicit phy_init() > call is performed. > > The same code is in sun6i-mipi-csi2/sun6i_mipi_csi2.c, but in this driver > phy_init() IS called. > > I leave it as-is because I don't if it is an issue or not. > My feeling is that it is a copy'n'paste error and that it should be > removed. > --- > .../sun8i_a83t_mipi_csi2.c | 21 ++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > index d052ee77ef0a..67c7475d5d10 100644 > --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > @@ -719,13 +719,15 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > csi2_dev->clock_mipi = devm_clk_get(dev, "mipi"); > if (IS_ERR(csi2_dev->clock_mipi)) { > dev_err(dev, "failed to acquire mipi clock\n"); > - return PTR_ERR(csi2_dev->clock_mipi); > + ret = PTR_ERR(csi2_dev->clock_mipi); > + goto err_put_clk_rate; > } > > csi2_dev->clock_misc = devm_clk_get(dev, "misc"); > if (IS_ERR(csi2_dev->clock_misc)) { > dev_err(dev, "failed to acquire misc clock\n"); > - return PTR_ERR(csi2_dev->clock_misc); > + ret = PTR_ERR(csi2_dev->clock_misc); > + goto err_put_clk_rate; > } > > /* Reset */ > @@ -733,7 +735,8 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > csi2_dev->reset = devm_reset_control_get_shared(dev, NULL); > if (IS_ERR(csi2_dev->reset)) { > dev_err(dev, "failed to get reset controller\n"); > - return PTR_ERR(csi2_dev->reset); > + ret = PTR_ERR(csi2_dev->reset); > + goto err_put_clk_rate; > } > > /* D-PHY */ > @@ -741,7 +744,7 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > ret = sun8i_a83t_dphy_register(csi2_dev); > if (ret) { > dev_err(dev, "failed to initialize MIPI D-PHY\n"); > - return ret; > + goto err_put_clk_rate; > } > > /* Runtime PM */ > @@ -749,6 +752,10 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > pm_runtime_enable(dev); > > return 0; > + > +err_put_clk_rate: Please call this "error_clock_rate_exclusive", > + clk_rate_exclusive_put(csi2_dev->clock_mod); and add a blank line here. > + return ret; > } > > static void > @@ -778,9 +785,13 @@ static int sun8i_a83t_mipi_csi2_probe(struct platform_device *platform_dev) > > ret = sun8i_a83t_mipi_csi2_bridge_setup(csi2_dev); > if (ret) > - return ret; > + goto err_cleanup_resources; > > return 0; > + > +err_cleanup_resources: Please call this "error_resources", > + sun8i_a83t_mipi_csi2_resources_cleanup(csi2_dev); and add a blank line here. Thanks! Paul > + return ret; > } > > static int sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev) > -- > 2.34.1 >
Hi Christophe, On Sun 31 Jul 22, 21:22, Christophe JAILLET wrote: > Release some resources in the error handling path of the probe and of > sun6i_mipi_csi2_resources_setup(), as already done in the remove > function. Thanks again, my comments are the same as in the other patch! > Fixes: af54b4f4c17f ("media: sunxi: Add support for the A31 MIPI CSI-2 controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c > index a4e3f9a6b2ff..1ee8501e25f6 100644 > --- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c > +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c > @@ -661,7 +661,8 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev, > csi2_dev->reset = devm_reset_control_get_shared(dev, NULL); > if (IS_ERR(csi2_dev->reset)) { > dev_err(dev, "failed to get reset controller\n"); > - return PTR_ERR(csi2_dev->reset); > + ret = PTR_ERR(csi2_dev->reset); > + goto err_put_clk_rate; > } > > /* D-PHY */ > @@ -669,13 +670,14 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev, > csi2_dev->dphy = devm_phy_get(dev, "dphy"); > if (IS_ERR(csi2_dev->dphy)) { > dev_err(dev, "failed to get MIPI D-PHY\n"); > - return PTR_ERR(csi2_dev->dphy); > + ret = PTR_ERR(csi2_dev->dphy); > + goto err_put_clk_rate; > } > > ret = phy_init(csi2_dev->dphy); > if (ret) { > dev_err(dev, "failed to initialize MIPI D-PHY\n"); > - return ret; > + goto err_put_clk_rate; > } > > /* Runtime PM */ > @@ -683,6 +685,10 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev, > pm_runtime_enable(dev); > > return 0; > + > +err_put_clk_rate: Please call this "error_clock_rate_exclusive", > + clk_rate_exclusive_put(csi2_dev->clock_mod); and add a blank line here. > + return ret; > } > > static void > @@ -712,9 +718,13 @@ static int sun6i_mipi_csi2_probe(struct platform_device *platform_dev) > > ret = sun6i_mipi_csi2_bridge_setup(csi2_dev); > if (ret) > - return ret; > + goto err_cleanup_resources; > > return 0; > + > +err_cleanup_resources: Please call this "error_resources", > + sun6i_mipi_csi2_resources_cleanup(csi2_dev); and add a blank line here. Thanks, Paul > + return ret; > } > > static int sun6i_mipi_csi2_remove(struct platform_device *platform_dev) > -- > 2.34.1 >
diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c index d052ee77ef0a..67c7475d5d10 100644 --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c @@ -719,13 +719,15 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->clock_mipi = devm_clk_get(dev, "mipi"); if (IS_ERR(csi2_dev->clock_mipi)) { dev_err(dev, "failed to acquire mipi clock\n"); - return PTR_ERR(csi2_dev->clock_mipi); + ret = PTR_ERR(csi2_dev->clock_mipi); + goto err_put_clk_rate; } csi2_dev->clock_misc = devm_clk_get(dev, "misc"); if (IS_ERR(csi2_dev->clock_misc)) { dev_err(dev, "failed to acquire misc clock\n"); - return PTR_ERR(csi2_dev->clock_misc); + ret = PTR_ERR(csi2_dev->clock_misc); + goto err_put_clk_rate; } /* Reset */ @@ -733,7 +735,8 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->reset = devm_reset_control_get_shared(dev, NULL); if (IS_ERR(csi2_dev->reset)) { dev_err(dev, "failed to get reset controller\n"); - return PTR_ERR(csi2_dev->reset); + ret = PTR_ERR(csi2_dev->reset); + goto err_put_clk_rate; } /* D-PHY */ @@ -741,7 +744,7 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de ret = sun8i_a83t_dphy_register(csi2_dev); if (ret) { dev_err(dev, "failed to initialize MIPI D-PHY\n"); - return ret; + goto err_put_clk_rate; } /* Runtime PM */ @@ -749,6 +752,10 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de pm_runtime_enable(dev); return 0; + +err_put_clk_rate: + clk_rate_exclusive_put(csi2_dev->clock_mod); + return ret; } static void @@ -778,9 +785,13 @@ static int sun8i_a83t_mipi_csi2_probe(struct platform_device *platform_dev) ret = sun8i_a83t_mipi_csi2_bridge_setup(csi2_dev); if (ret) - return ret; + goto err_cleanup_resources; return 0; + +err_cleanup_resources: + sun8i_a83t_mipi_csi2_resources_cleanup(csi2_dev); + return ret; } static int sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev)
Release some resources in the error handling path of the probe and of sun8i_a83t_mipi_csi2_resources_setup(), as already done in the remove function. Fixes: 576d196c522b ("media: sunxi: Add support for the A83T MIPI CSI-2 controller") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- I'm unsure about the phy_exit() call in sun8i_a83t_mipi_csi2_resources_cleanup() because no explicit phy_init() call is performed. The same code is in sun6i-mipi-csi2/sun6i_mipi_csi2.c, but in this driver phy_init() IS called. I leave it as-is because I don't if it is an issue or not. My feeling is that it is a copy'n'paste error and that it should be removed. --- .../sun8i_a83t_mipi_csi2.c | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)