Patchwork mtd: s3c2410 nand: Remove uncessary null check

login
register
mail settings
Submitter jhbird.choi@samsung.com
Date July 21, 2011, 6:33 a.m.
Message ID <1311230038-6111-1-git-send-email-jhbird.choi@samsung.com>
Download mbox | patch
Permalink /patch/105984/
State New
Headers show

Comments

jhbird.choi@samsung.com - July 21, 2011, 6:33 a.m.
From: Jonghwan Choi <jhbird.choi@samsung.com>

clk_get() return a pointer to the struct clk or an ERR_PTR().

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
---
 drivers/mtd/nand/s3c2410.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Varun Wadekar - July 21, 2011, 6:54 a.m.
On Thursday 21 July 2011 12:03 PM, jhbird.choi@samsung.com wrote:
> From: Jonghwan Choi <jhbird.choi@samsung.com>
>
> clk_get() return a pointer to the struct clk or an ERR_PTR().
>
> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
> ---
>  drivers/mtd/nand/s3c2410.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 4405468..18ff2f5 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -723,7 +723,7 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)
>  
>  	/* free the common resources */
>  
> -	if (info->clk != NULL && !IS_ERR(info->clk)) {
> +	if (!IS_ERR(info->clk)) {

I think you should use IS_ERR_OR_NULL instead.
>  		s3c2410_nand_clk_set_state(info, CLOCK_DISABLE);
>  		clk_put(info->clk);
>  	}
Russell King - ARM Linux - July 21, 2011, 5:10 p.m.
On Thu, Jul 21, 2011 at 12:24:12PM +0530, Varun Wadekar wrote:
> On Thursday 21 July 2011 12:03 PM, jhbird.choi@samsung.com wrote:
> > From: Jonghwan Choi <jhbird.choi@samsung.com>
> >
> > clk_get() return a pointer to the struct clk or an ERR_PTR().
> >
> > Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
> > ---
> >  drivers/mtd/nand/s3c2410.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> > index 4405468..18ff2f5 100644
> > --- a/drivers/mtd/nand/s3c2410.c
> > +++ b/drivers/mtd/nand/s3c2410.c
> > @@ -723,7 +723,7 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)
> >  
> >  	/* free the common resources */
> >  
> > -	if (info->clk != NULL && !IS_ERR(info->clk)) {
> > +	if (!IS_ERR(info->clk)) {
> 
> I think you should use IS_ERR_OR_NULL instead.

No.  Jonghwan Choi's patch is correct.

As per the patch description, the only error value which a driver can
attribute any problem with is something which passes IS_ERR().  Everything
else the driver must treat as a _valid_ struct clk - and the clk API
implementation must accept non-IS_ERR() clk_get() values.
Artem Bityutskiy - July 22, 2011, 8:27 a.m.
On Thu, 2011-07-21 at 15:33 +0900, jhbird.choi@samsung.com wrote:
> From: Jonghwan Choi <jhbird.choi@samsung.com>
> 
> clk_get() return a pointer to the struct clk or an ERR_PTR().
> 
> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>

Pushed to l2-mtd-2.6.git, thanks!

Patch

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 4405468..18ff2f5 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -723,7 +723,7 @@  static int s3c24xx_nand_remove(struct platform_device *pdev)
 
 	/* free the common resources */
 
-	if (info->clk != NULL && !IS_ERR(info->clk)) {
+	if (!IS_ERR(info->clk)) {
 		s3c2410_nand_clk_set_state(info, CLOCK_DISABLE);
 		clk_put(info->clk);
 	}