[PATCH] rewrite the return method of static int s3c24xx_spi_setup(struct spi_device *spi) in drivers/spi/spi_s3c24xx.c

[PATCH] rewrite the return method of static int s3c24xx_spi_setup(struct spi_device *spi) in drivers/spi/spi_s3c24xx.c

[Helight.Xu]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

rewrite the return method of static int 
s3c24xx_spi_setup(struct spi_device *spi) 
in drivers/spi/spi_s3c24xx.c 

reason:
s3c24xx_spi_setupxfer(spi, NULL) return 0 or -EINVAL, 
so here shoud return the ret,but only 0.

here:
 drivers/spi/spi_s3c24xx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 3eb414b..0489254 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -165,14 +165,14 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
        ret = s3c24xx_spi_setupxfer(spi, NULL);
        if (ret < 0) {
                dev_err(&spi->dev, "setupxfer returned %d\n", ret);
-               return ret;
+               goto err;
        }
 
        dev_dbg(&spi->dev, "%s: mode %d, %u bpw, %d hz\n",
                __func__, spi->mode, spi->bits_per_word,
                spi->max_speed_hz);
-                                                                                        
-       return 0;
+err:
+       return ret;
 }
 
 static inline unsigned int hw_txbyte(struct s3c24xx_spi *hw, int count)

-- 
---------------------------------
Zhenwen Xu - Open and Free
Home Page:	http://zhwen.org
My Studio:	http://dim4.cn

[-- Attachment #2: 0001-rewrite-the-return-method-of-static-int-s3c24xx_spi_setup.patch --]
[-- Type: text/x-diff, Size: 1052 bytes --]

>From a99ab2a4a87f330125ed6263c16b4036d4991b89 Mon Sep 17 00:00:00 2001
From: Zhwen Xu <Helight.Xu@gmail.com>
Date: Wed, 10 Dec 2008 10:38:36 +0800
Subject: [PATCH] rewrite the return method of static int s3c24xx_spi_setup(struct spi_device *spi) in drivers/spi/spi_s3c24xx.c


Signed-off-by: ZhenwenXu <helight.xu@gmail.com> 
---
 drivers/spi/spi_s3c24xx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 3eb414b..0489254 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -165,14 +165,14 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
 	ret = s3c24xx_spi_setupxfer(spi, NULL);
 	if (ret < 0) {
 		dev_err(&spi->dev, "setupxfer returned %d\n", ret);
-		return ret;
+		goto err;
 	}
 
 	dev_dbg(&spi->dev, "%s: mode %d, %u bpw, %d hz\n",
 		__func__, spi->mode, spi->bits_per_word,
 		spi->max_speed_hz);
-
-	return 0;
+err:
+	return ret;
 }
 
 static inline unsigned int hw_txbyte(struct s3c24xx_spi *hw, int count)
-- 
1.5.6.5

Re: [PATCH] rewrite the return method of static int s3c24xx_spi_setup(struct spi_device *spi) in drivers/spi/spi_s3c24xx.c

[Jianjun Kong]

On Wed, Dec 10, 2008 at 11:01:51AM +0800, Helight.Xu wrote:
>rewrite the return method of static int 
>s3c24xx_spi_setup(struct spi_device *spi) 
>in drivers/spi/spi_s3c24xx.c 
>
>reason:
>s3c24xx_spi_setupxfer(spi, NULL) return 0 or -EINVAL, 
>so here shoud return the ret,but only 0.

The original code can return the correct value.
It contains 0 and -EINVAL, not only 0. So this change is not essential.


-- 
Jianjun Kong |Happy Hacking
Homepage: http://kongove.cn
Gtalk:KongJianjun@gmail.com