[PATCH] Staging: sm750fb: Remove an unnecessary local variable in a function

[PATCH] Staging: sm750fb: Remove an unnecessary local variable in a function

[Madhumitha Prabakaran]

Remove an unnecessary local variable in  sm750_format_pll_reg function
and replace its initialization directly in return type.
Issue suggested by Coccinelle using ret.cocci.

Signed-off-by: Madhumitha Prabakaran <madhumithabiw@gmail.com>
---
 drivers/staging/sm750fb/ddk750_chip.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
index 90f5480304f4..93abfa8b0090 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -391,7 +391,6 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
 	unsigned int OD = pPLL->OD;
 	unsigned int M = pPLL->M;
 	unsigned int N = pPLL->N;
-	unsigned int reg = 0;
 
 	/*
 	 * Note that all PLL's have the same format. Here, we just use
@@ -399,13 +398,11 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
 	 * register. On returning a 32 bit number, the value can be
 	 * applied to any PLL in the calling function.
 	 */
-	reg = PLL_CTRL_POWER |
+	return PLL_CTRL_POWER |
 #ifndef VALIDATION_CHIP
 		((POD << PLL_CTRL_POD_SHIFT) & PLL_CTRL_POD_MASK) |
 #endif
 		((OD << PLL_CTRL_OD_SHIFT) & PLL_CTRL_OD_MASK) |
 		((N << PLL_CTRL_N_SHIFT) & PLL_CTRL_N_MASK) |
 		((M << PLL_CTRL_M_SHIFT) & PLL_CTRL_M_MASK);
-
-	return reg;
 }
-- 
2.17.1

Re: [Outreachy kernel] [PATCH] Staging: sm750fb: Remove an unnecessary local variable in a function

[Julia Lawall]

On Wed, 13 Mar 2019, Madhumitha Prabakaran wrote:

> Remove an unnecessary local variable in  sm750_format_pll_reg function
> and replace its initialization directly in return type.
> Issue suggested by Coccinelle using ret.cocci.
>
> Signed-off-by: Madhumitha Prabakaran <madhumithabiw@gmail.com>
> ---
>  drivers/staging/sm750fb/ddk750_chip.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
> index 90f5480304f4..93abfa8b0090 100644
> --- a/drivers/staging/sm750fb/ddk750_chip.c
> +++ b/drivers/staging/sm750fb/ddk750_chip.c
> @@ -391,7 +391,6 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
>  	unsigned int OD = pPLL->OD;
>  	unsigned int M = pPLL->M;
>  	unsigned int N = pPLL->N;
> -	unsigned int reg = 0;
>
>  	/*
>  	 * Note that all PLL's have the same format. Here, we just use
> @@ -399,13 +398,11 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
>  	 * register. On returning a 32 bit number, the value can be
>  	 * applied to any PLL in the calling function.
>  	 */
> -	reg = PLL_CTRL_POWER |
> +	return PLL_CTRL_POWER |
>  #ifndef VALIDATION_CHIP
>  		((POD << PLL_CTRL_POD_SHIFT) & PLL_CTRL_POD_MASK) |
>  #endif
>  		((OD << PLL_CTRL_OD_SHIFT) & PLL_CTRL_OD_MASK) |
>  		((N << PLL_CTRL_N_SHIFT) & PLL_CTRL_N_MASK) |
>  		((M << PLL_CTRL_M_SHIFT) & PLL_CTRL_M_MASK);
> -
> -	return reg;

This is going better in the right direction.  But maybe it is less
readable than before, with that very large expression and the ifndef...

julia

>  }
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190313153205.4974-1-madhumithabiw%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] Staging: sm750fb: Remove an unnecessary local variable in a function

[Madhumthia Prabakaran]

On Wed, Mar 13, 2019 at 04:35:39PM +0100, Julia Lawall wrote:
> 
> 
> On Wed, 13 Mar 2019, Madhumitha Prabakaran wrote:
> 
> > Remove an unnecessary local variable in  sm750_format_pll_reg function
> > and replace its initialization directly in return type.
> > Issue suggested by Coccinelle using ret.cocci.
> >
> > Signed-off-by: Madhumitha Prabakaran <madhumithabiw@gmail.com>
> > ---
> >  drivers/staging/sm750fb/ddk750_chip.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
> > index 90f5480304f4..93abfa8b0090 100644
> > --- a/drivers/staging/sm750fb/ddk750_chip.c
> > +++ b/drivers/staging/sm750fb/ddk750_chip.c
> > @@ -391,7 +391,6 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
> >  	unsigned int OD = pPLL->OD;
> >  	unsigned int M = pPLL->M;
> >  	unsigned int N = pPLL->N;
> > -	unsigned int reg = 0;
> >
> >  	/*
> >  	 * Note that all PLL's have the same format. Here, we just use
> > @@ -399,13 +398,11 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
> >  	 * register. On returning a 32 bit number, the value can be
> >  	 * applied to any PLL in the calling function.
> >  	 */
> > -	reg = PLL_CTRL_POWER |
> > +	return PLL_CTRL_POWER |
> >  #ifndef VALIDATION_CHIP
> >  		((POD << PLL_CTRL_POD_SHIFT) & PLL_CTRL_POD_MASK) |
> >  #endif
> >  		((OD << PLL_CTRL_OD_SHIFT) & PLL_CTRL_OD_MASK) |
> >  		((N << PLL_CTRL_N_SHIFT) & PLL_CTRL_N_MASK) |
> >  		((M << PLL_CTRL_M_SHIFT) & PLL_CTRL_M_MASK);
> > -
> > -	return reg;
> 
> This is going better in the right direction.  But maybe it is less
> readable than before, with that very large expression and the ifndef...
> 
> julia
> 
> >  }
> > --
> > 2.17.1
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190313153205.4974-1-madhumithabiw%40gmail.com.
> > For more options, visit https://groups.google.com/d/optout.
> >
> 
> -- 
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.20.1903131634500.27312%40hadrien.
> For more options, visit https://groups.google.com/d/optout.

Do you want me to drop this? As the previous code is more readable than this one.

thanks,
Madhumitha

Re: [Outreachy kernel] [PATCH] Staging: sm750fb: Remove an unnecessary local variable in a function

[Julia Lawall]

On Wed, 13 Mar 2019, Madhumthia Prabakaran wrote:

> On Wed, Mar 13, 2019 at 04:35:39PM +0100, Julia Lawall wrote:
> >
> >
> > On Wed, 13 Mar 2019, Madhumitha Prabakaran wrote:
> >
> > > Remove an unnecessary local variable in  sm750_format_pll_reg function
> > > and replace its initialization directly in return type.
> > > Issue suggested by Coccinelle using ret.cocci.
> > >
> > > Signed-off-by: Madhumitha Prabakaran <madhumithabiw@gmail.com>
> > > ---
> > >  drivers/staging/sm750fb/ddk750_chip.c | 5 +----
> > >  1 file changed, 1 insertion(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
> > > index 90f5480304f4..93abfa8b0090 100644
> > > --- a/drivers/staging/sm750fb/ddk750_chip.c
> > > +++ b/drivers/staging/sm750fb/ddk750_chip.c
> > > @@ -391,7 +391,6 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
> > >  	unsigned int OD = pPLL->OD;
> > >  	unsigned int M = pPLL->M;
> > >  	unsigned int N = pPLL->N;
> > > -	unsigned int reg = 0;
> > >
> > >  	/*
> > >  	 * Note that all PLL's have the same format. Here, we just use
> > > @@ -399,13 +398,11 @@ unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
> > >  	 * register. On returning a 32 bit number, the value can be
> > >  	 * applied to any PLL in the calling function.
> > >  	 */
> > > -	reg = PLL_CTRL_POWER |
> > > +	return PLL_CTRL_POWER |
> > >  #ifndef VALIDATION_CHIP
> > >  		((POD << PLL_CTRL_POD_SHIFT) & PLL_CTRL_POD_MASK) |
> > >  #endif
> > >  		((OD << PLL_CTRL_OD_SHIFT) & PLL_CTRL_OD_MASK) |
> > >  		((N << PLL_CTRL_N_SHIFT) & PLL_CTRL_N_MASK) |
> > >  		((M << PLL_CTRL_M_SHIFT) & PLL_CTRL_M_MASK);
> > > -
> > > -	return reg;
> >
> > This is going better in the right direction.  But maybe it is less
> > readable than before, with that very large expression and the ifndef...
> >
> > julia
> >
> > >  }
> > > --
> > > 2.17.1
> > >
> > > --
> > > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190313153205.4974-1-madhumithabiw%40gmail.com.
> > > For more options, visit https://groups.google.com/d/optout.
> > >
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.20.1903131634500.27312%40hadrien.
> > For more options, visit https://groups.google.com/d/optout.
>
> Do you want me to drop this? As the previous code is more readable than this one.

I don't know.  Greg decides...

julia