* [PATCH] spi/imx: simplify error handling to free gpios
@ 2011-12-05 7:47 Axel Lin
2011-12-06 1:45 ` Shawn Guo
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-12-05 7:47 UTC (permalink / raw)
To: linux-kernel; +Cc: Shawn Guo, Sascha Hauer, Grant Likely, spi-devel-general
Simplify the error handling by moving the code to free gpios in one place.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] spi/imx: simplify error handling to free gpios
2011-12-05 7:47 [PATCH] spi/imx: simplify error handling to free gpios Axel Lin
@ 2011-12-06 1:45 ` Shawn Guo
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Guo @ 2011-12-06 1:45 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Shawn Guo, Sascha Hauer, Grant Likely,
spi-devel-general
On Mon, Dec 05, 2011 at 03:47:08PM +0800, Axel Lin wrote:
> Simplify the error handling by moving the code to free gpios in one place.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Regards,
Shawn
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-06 1:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-05 7:47 [PATCH] spi/imx: simplify error handling to free gpios Axel Lin
2011-12-06 1:45 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox