* [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues
@ 2011-08-09 21:11 H Hartley Sweeten
2011-08-09 21:47 ` Ryan Mallon
0 siblings, 1 reply; 4+ messages in thread
From: H Hartley Sweeten @ 2011-08-09 21:11 UTC (permalink / raw)
To: linux-arm-kernel
This fixes all the checkpatch.pl errors and warnings found in this file.
#201: ERROR: space required after that ',' (ctx:VxV)
#201: ERROR: space required after that ',' (ctx:VxV)
#250: WARNING: line over 80 characters
#281: WARNING: line over 80 characters
#361: WARNING: line over 80 characters
#435: ERROR: trailing whitespace
#438: ERROR: trailing whitespace
#449: ERROR: trailing whitespace
#451: ERROR: trailing whitespace
total: 6 errors, 3 warnings, 562 lines checked
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
---
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index ca4de71..14dba95 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -198,7 +198,7 @@ static struct clk clk_m2m1 = {
.enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M1,
};
-#define INIT_CK(dev,con,ck) \
+#define INIT_CK(dev, con, ck) \
{ .dev_id = dev, .con_id = con, .clk = ck }
static struct clk_lookup clocks[] = {
@@ -247,7 +247,8 @@ static void __clk_enable(struct clk *clk)
v = __raw_readl(clk->enable_reg);
v |= clk->enable_mask;
if (clk->sw_locked)
- ep93xx_syscon_swlocked_write(v, clk->enable_reg);
+ ep93xx_syscon_swlocked_write(v,
+ clk->enable_reg);
else
__raw_writel(v, clk->enable_reg);
}
@@ -278,7 +279,8 @@ static void __clk_disable(struct clk *clk)
v = __raw_readl(clk->enable_reg);
v &= ~clk->enable_mask;
if (clk->sw_locked)
- ep93xx_syscon_swlocked_write(v, clk->enable_reg);
+ ep93xx_syscon_swlocked_write(v,
+ clk->enable_reg);
else
__raw_writel(v, clk->enable_reg);
}
@@ -358,7 +360,7 @@ static int calc_clk_div(struct clk *clk, unsigned long rate,
int i, found = 0, __div = 0, __pdiv = 0;
/* Don't exceed the maximum rate */
- max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
+ max_rate = max3(clk_pll1.rate/4, clk_pll2.rate/4, clk_xtali.rate/4);
rate = min(rate, max_rate);
/*
@@ -432,35 +434,32 @@ static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate)
unsigned val = __raw_readl(clk->enable_reg);
if (rate == clk_i2s_mclk.rate / 2)
- ep93xx_syscon_swlocked_write(val & ~EP93XX_I2SCLKDIV_SDIV,
- clk->enable_reg);
+ val &= ~EP93XX_I2SCLKDIV_SDIV;
else if (rate == clk_i2s_mclk.rate / 4)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_SDIV,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_SDIV;
else
return -EINVAL;
+ ep93xx_syscon_swlocked_write(val, clk->enable_reg);
clk_i2s_sclk.rate = rate;
return 0;
}
static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate)
{
- unsigned val = __raw_readl(clk->enable_reg) &
+ unsigned val = __raw_readl(clk->enable_reg) &
~EP93XX_I2SCLKDIV_LRDIV_MASK;
-
+
if (rate == clk_i2s_sclk.rate / 32)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV32,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV32;
else if (rate == clk_i2s_sclk.rate / 64)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV64,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV64;
else if (rate == clk_i2s_sclk.rate / 128)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV128,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV128;
else
return -EINVAL;
+ ep93xx_syscon_swlocked_write(val, clk->enable_reg);
clk_i2s_lrclk.rate = rate;
return 0;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues
2011-08-09 21:11 [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues H Hartley Sweeten
@ 2011-08-09 21:47 ` Ryan Mallon
2011-08-09 21:57 ` H Hartley Sweeten
2011-08-09 22:16 ` H Hartley Sweeten
0 siblings, 2 replies; 4+ messages in thread
From: Ryan Mallon @ 2011-08-09 21:47 UTC (permalink / raw)
To: linux-arm-kernel
On 10/08/11 07:11, H Hartley Sweeten wrote:
> This fixes all the checkpatch.pl errors and warnings found in this file.
>
> #201: ERROR: space required after that ',' (ctx:VxV)
> #201: ERROR: space required after that ',' (ctx:VxV)
> #250: WARNING: line over 80 characters
> #281: WARNING: line over 80 characters
> #361: WARNING: line over 80 characters
> #435: ERROR: trailing whitespace
> #438: ERROR: trailing whitespace
> #449: ERROR: trailing whitespace
> #451: ERROR: trailing whitespace
>
> total: 6 errors, 3 warnings, 562 lines checked
>
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
>
> ---
>
> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
> index ca4de71..14dba95 100644
> --- a/arch/arm/mach-ep93xx/clock.c
> +++ b/arch/arm/mach-ep93xx/clock.c
> @@ -198,7 +198,7 @@ static struct clk clk_m2m1 = {
> .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M1,
> };
>
> -#define INIT_CK(dev,con,ck) \
> +#define INIT_CK(dev, con, ck) \
> { .dev_id = dev, .con_id = con, .clk = ck }
Okay.
>
> static struct clk_lookup clocks[] = {
> @@ -247,7 +247,8 @@ static void __clk_enable(struct clk *clk)
> v = __raw_readl(clk->enable_reg);
> v |= clk->enable_mask;
> if (clk->sw_locked)
> - ep93xx_syscon_swlocked_write(v, clk->enable_reg);
> + ep93xx_syscon_swlocked_write(v,
> +
I think this makes the code arguably less readable. The line only just
extends over 80 characters.
> clk->enable_reg);
> else
> __raw_writel(v, clk->enable_reg);
> }
> @@ -278,7 +279,8 @@ static void __clk_disable(struct clk *clk)
> v = __raw_readl(clk->enable_reg);
> v &= ~clk->enable_mask;
> if (clk->sw_locked)
> - ep93xx_syscon_swlocked_write(v, clk->enable_reg);
> + ep93xx_syscon_swlocked_write(v,
> + clk->enable_reg);
Same here.
> else
> __raw_writel(v, clk->enable_reg);
> }
> @@ -358,7 +360,7 @@ static int calc_clk_div(struct clk *clk, unsigned long rate,
> int i, found = 0, __div = 0, __pdiv = 0;
>
> /* Don't exceed the maximum rate */
> - max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
> + max_rate = max3(clk_pll1.rate/4, clk_pll2.rate/4, clk_xtali.rate/4);
Don't delete the spaces around the operators. Again, this line is only
just over 80 characters. I think its okay as is. If you must fix it,
break on one of the commas instead.
> rate = min(rate, max_rate);
>
> /*
> @@ -432,35 +434,32 @@ static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate)
> unsigned val = __raw_readl(clk->enable_reg);
>
> if (rate == clk_i2s_mclk.rate / 2)
> - ep93xx_syscon_swlocked_write(val & ~EP93XX_I2SCLKDIV_SDIV,
> - clk->enable_reg);
> + val &= ~EP93XX_I2SCLKDIV_SDIV;
> else if (rate == clk_i2s_mclk.rate / 4)
> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_SDIV,
> - clk->enable_reg);
> + val |= EP93XX_I2SCLKDIV_SDIV;
> else
> return -EINVAL;
>
> + ep93xx_syscon_swlocked_write(val, clk->enable_reg);
> clk_i2s_sclk.rate = rate;
> return 0;
This change is good.
> }
>
> static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate)
> {
> - unsigned val = __raw_readl(clk->enable_reg) &
> + unsigned val = __raw_readl(clk->enable_reg) &
> ~EP93XX_I2SCLKDIV_LRDIV_MASK;
> -
> +
> if (rate == clk_i2s_sclk.rate / 32)
> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV32,
> - clk->enable_reg);
> + val |= EP93XX_I2SCLKDIV_LRDIV32;
> else if (rate == clk_i2s_sclk.rate / 64)
> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV64,
> - clk->enable_reg);
> + val |= EP93XX_I2SCLKDIV_LRDIV64;
> else if (rate == clk_i2s_sclk.rate / 128)
> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV128,
> - clk->enable_reg);
> + val |= EP93XX_I2SCLKDIV_LRDIV128;
> else
> return -EINVAL;
>
> + ep93xx_syscon_swlocked_write(val, clk->enable_reg);
> clk_i2s_lrclk.rate = rate;
> return 0;
> }
This is good too.
~Ryan
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues
2011-08-09 21:47 ` Ryan Mallon
@ 2011-08-09 21:57 ` H Hartley Sweeten
2011-08-09 22:16 ` H Hartley Sweeten
1 sibling, 0 replies; 4+ messages in thread
From: H Hartley Sweeten @ 2011-08-09 21:57 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday, August 09, 2011 2:47 PM, Ryan Mallon wrote:
> On 10/08/11 07:11, H Hartley Sweeten wrote:
>> This fixes all the checkpatch.pl errors and warnings found in this file.
>>
>> #201: ERROR: space required after that ',' (ctx:VxV)
>> #201: ERROR: space required after that ',' (ctx:VxV)
>> #250: WARNING: line over 80 characters
>> #281: WARNING: line over 80 characters
>> #361: WARNING: line over 80 characters
>> #435: ERROR: trailing whitespace
>> #438: ERROR: trailing whitespace
>> #449: ERROR: trailing whitespace
>> #451: ERROR: trailing whitespace
>>
>> total: 6 errors, 3 warnings, 562 lines checked
>>
>> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
>> Cc: Ryan Mallon <rmallon@gmail.com>
>>
>> ---
>>
>> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
>> index ca4de71..14dba95 100644
>> --- a/arch/arm/mach-ep93xx/clock.c
>> +++ b/arch/arm/mach-ep93xx/clock.c
>> @@ -198,7 +198,7 @@ static struct clk clk_m2m1 = {
>> .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M1,
>> };
>>
>> -#define INIT_CK(dev,con,ck) \
>> +#define INIT_CK(dev, con, ck) \
>> { .dev_id = dev, .con_id = con, .clk = ck }
>
> Okay.
OK.
>
>>
>> static struct clk_lookup clocks[] = {
>> @@ -247,7 +247,8 @@ static void __clk_enable(struct clk *clk)
>> v = __raw_readl(clk->enable_reg);
>> v |= clk->enable_mask;
>> if (clk->sw_locked)
>> - ep93xx_syscon_swlocked_write(v, clk->enable_reg);
>> + ep93xx_syscon_swlocked_write(v,
>> +
>
> I think this makes the code arguably less readable. The line only just
> extends over 80 characters.
See the comment below.
>> clk->enable_reg);
>> else
>> __raw_writel(v, clk->enable_reg);
>> }
>> @@ -278,7 +279,8 @@ static void __clk_disable(struct clk *clk)
>> v = __raw_readl(clk->enable_reg);
>> v &= ~clk->enable_mask;
>> if (clk->sw_locked)
>> - ep93xx_syscon_swlocked_write(v, clk->enable_reg);
>> + ep93xx_syscon_swlocked_write(v,
>> + clk->enable_reg);
>
> Same here.
The other way to fix both of these is to add a return on the clk->users check
preceding the set/clear of the enable register.
Currently they are coded like this:
static void __clk_enable(struct clk *clk)
{
if (!clk->users++) {
...
}
}
static void __clk_disable(struct clk *clk)
{
if (!--clk->users) {
...
}
}
Both the over 80 character lines could be brought back a full tab by doing:
static void __clk_enable(struct clk *clk)
{
if (clk->users++)
return;
...
}
static void __clk_disable(struct clk *clk)
{
if (--clk->users)
return;
...
}
Are you ok with that change or should I just leave the over 80 char lines?
>> else
>> __raw_writel(v, clk->enable_reg);
>> }
>> @@ -358,7 +360,7 @@ static int calc_clk_div(struct clk *clk, unsigned long rate,
>> int i, found = 0, __div = 0, __pdiv = 0;
>>
>> /* Don't exceed the maximum rate */
>> - max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
>> + max_rate = max3(clk_pll1.rate/4, clk_pll2.rate/4, clk_xtali.rate/4);
>
> Don't delete the spaces around the operators. Again, this line is only
> just over 80 characters. I think its okay as is. If you must fix it,
> break on one of the commas instead.
I'll break the line at a comma. I'm really trying to get ep93xx checkpatch clean.
>> rate = min(rate, max_rate);
>>
>> /*
>> @@ -432,35 +434,32 @@ static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate)
>> unsigned val = __raw_readl(clk->enable_reg);
>>
>> if (rate == clk_i2s_mclk.rate / 2)
>> - ep93xx_syscon_swlocked_write(val & ~EP93XX_I2SCLKDIV_SDIV,
>> - clk->enable_reg);
>> + val &= ~EP93XX_I2SCLKDIV_SDIV;
>> else if (rate == clk_i2s_mclk.rate / 4)
>> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_SDIV,
>> - clk->enable_reg);
>> + val |= EP93XX_I2SCLKDIV_SDIV;
>> else
>> return -EINVAL;
>>
>> + ep93xx_syscon_swlocked_write(val, clk->enable_reg);
>> clk_i2s_sclk.rate = rate;
>> return 0;
>
> This change is good.
OK.
>> }
>>
>> static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate)
>> {
>> - unsigned val = __raw_readl(clk->enable_reg) &
>> + unsigned val = __raw_readl(clk->enable_reg) &
>> ~EP93XX_I2SCLKDIV_LRDIV_MASK;
>> -
>> +
>> if (rate == clk_i2s_sclk.rate / 32)
>> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV32,
>> - clk->enable_reg);
>> + val |= EP93XX_I2SCLKDIV_LRDIV32;
>> else if (rate == clk_i2s_sclk.rate / 64)
>> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV64,
>> - clk->enable_reg);
>> + val |= EP93XX_I2SCLKDIV_LRDIV64;
>> else if (rate == clk_i2s_sclk.rate / 128)
>> - ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV128,
>> - clk->enable_reg);
>> + val |= EP93XX_I2SCLKDIV_LRDIV128;
>> else
>> return -EINVAL;
>>
>> + ep93xx_syscon_swlocked_write(val, clk->enable_reg);
>> clk_i2s_lrclk.rate = rate;
>> return 0;
>> }
> This is good too.
OK.
Thanks,
Hartley
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues
2011-08-09 21:47 ` Ryan Mallon
2011-08-09 21:57 ` H Hartley Sweeten
@ 2011-08-09 22:16 ` H Hartley Sweeten
1 sibling, 0 replies; 4+ messages in thread
From: H Hartley Sweeten @ 2011-08-09 22:16 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday, August 09, 2011 2:47 PM, Ryan Mallon wrote:
> On 10/08/11 07:11, H Hartley Sweeten wrote:
>> This fixes all the checkpatch.pl errors and warnings found in this file.
[snip]
>> @@ -358,7 +360,7 @@ static int calc_clk_div(struct clk *clk, unsigned long rate,
>> int i, found = 0, __div = 0, __pdiv = 0;
>>
>> /* Don't exceed the maximum rate */
>> - max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
>> + max_rate = max3(clk_pll1.rate/4, clk_pll2.rate/4, clk_xtali.rate/4);
>
> Don't delete the spaces around the operators. Again, this line is only
> just over 80 characters. I think its okay as is. If you must fix it,
> break on one of the commas instead.
Ryan,
How about fixing the one above like this:
- max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
+ max_rate = max3(clk_pll1.rate, clk_pll2.rate, clk_xtali.rate);
+ max_rate /= 4;
Regards,
Hartley
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-09 22:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-09 21:11 [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues H Hartley Sweeten
2011-08-09 21:47 ` Ryan Mallon
2011-08-09 21:57 ` H Hartley Sweeten
2011-08-09 22:16 ` H Hartley Sweeten
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox