On Tue, 10 Jan 2012 15:27:36 +0800, Axel Lin <axel....@gmail.com> wrote:
> Simplify the error handling by moving the code to free gpios in one place.
>
> Signed-off-by: Axel Lin <axel....@gmail.com>
> Acked-by: Shawn Guo <shawn....@linaro.org>
Applied, thanks.
g.
> ---
> drivers/spi/spi-imx.c | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index c6e697f..31054e3 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -793,13 +793,8 @@ static int __devinit spi_imx_probe(struct
> platform_device *pdev)
>
> ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);
> if (ret) {
> - while (i > 0) {
> - i--;
> - if (spi_imx->chipselect[i] >= 0)
> - gpio_free(spi_imx->chipselect[i]);
> - }
> dev_err(&pdev->dev, "can't get cs gpios\n");
> - goto out_master_put;
> + goto out_gpio_free;
> }
> }
>
> @@ -881,10 +876,10 @@ out_iounmap:
> out_release_mem:
> release_mem_region(res->start, resource_size(res));
> out_gpio_free:
> - for (i = 0; i < master->num_chipselect; i++)
> + while (--i >= 0) {
> if (spi_imx->chipselect[i] >= 0)
> gpio_free(spi_imx->chipselect[i]);
> -out_master_put:
> + }
> spi_master_put(master);
> kfree(master);
> platform_set_drvdata(pdev, NULL);
> --
> 1.7.5.4
>
>
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
