[PATCH v4] ARM: mvebu: remove two selects of ARM_ERRATA_753970

[PATCH v4] ARM: mvebu: remove two selects of ARM_ERRATA_753970

[Paul Bolle]

ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
PL310 errata workarounds"). Still, two selects were added in v3.15 that
used the previous name. So these selects have always been nops.

It is clear that the intention here was to select PL310_ERRATA_753970.
But as, apparently, nothing broke for four releases we can assume
PL310_ERRATA_753970 isn't actually needed. So let's not rename these two
selects but just drop them instead.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
v4: Do no bother anymore to rename these selects. I've tried to do that
a few times ever since v3.15-rc1 was released. Last time, v3, was in
https://lkml.org/lkml/2014/9/12/231 . And since the people who
intruduced this issue apparently aren't bothered by it, neither should
I. So just do the safe and easy thing, which is removing these two
selects, as they are nops now.

Done on top of next-20150119.

 arch/arm/mach-mvebu/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index c1e4567a5ab3..e8e5fa25121c 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -37,7 +37,6 @@ config MACH_ARMADA_370
 config MACH_ARMADA_375
 	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
 	select ARM_ERRATA_720789
-	select ARM_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_375_CLK
 	select HAVE_ARM_SCU
@@ -52,7 +51,6 @@ config MACH_ARMADA_375
 config MACH_ARMADA_38X
 	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
 	select ARM_ERRATA_720789
-	select ARM_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_38X_CLK
 	select HAVE_ARM_SCU
-- 
1.9.3

[PATCH v4] ARM: mvebu: remove two selects of ARM_ERRATA_753970

[Paul Bolle]

Andy, Joe,

On Mon, 2015-01-19 at 10:32 +0100, Paul Bolle wrote:
> ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
> commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
> PL310 errata workarounds"). Still, two selects were added in v3.15 that
> used the previous name. So these selects have always been nops.
> 
> It is clear that the intention here was to select PL310_ERRATA_753970.
> But as, apparently, nothing broke for four releases we can assume
> PL310_ERRATA_753970 isn't actually needed. So let's not rename these two
> selects but just drop them instead.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

Checkpatch in next-21050119 complains:
    ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds")'
    #7: 
    commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
    
    total: 1 errors, 0 warnings, 14 lines checked
    
    Your patch has style problems, please review.

Perhaps it doesn't notice the quote spans two lines. Can this be fixed
please?

Thanks,


Paul Bolle

[PATCH] checkpatch: Add ability to coalesce commit descriptions on multiple lines

[Joe Perches]

If a git commit description is split on consecutive lines,
coalesce it before testing.

This allows:

  commit <foo> ("some long
  description")

Signed-off-by: Joe Perches <joe@perches.com>
Noticed-by: Paul Bolle <pebolle@tiscali.nl>
---
> Checkpatch in next-21050119 complains:
>     ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds")'
>     #7: 
>     commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
>     
>     total: 1 errors, 0 warnings, 14 lines checked
>     
>     Your patch has style problems, please review.
> 
> Perhaps it doesn't notice the quote spans two lines. Can this be fixed
> please?

Oh bother...

 scripts/checkpatch.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 41223c9..6a3baa0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2198,6 +2198,13 @@ sub process {
 				 defined $rawlines[$linenr] &&
 				 $rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
 				$orig_desc = $1;
+			} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
+				 defined $rawlines[$linenr] &&
+				 $rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
+				$line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)$/i;
+				$orig_desc = $1;
+				$rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
+				$orig_desc .= " " . $1;
 			}
 
 			($id, $description) = git_commit_info($orig_commit,

[PATCH] checkpatch: Add ability to coalesce commit descriptions on multiple lines

[Paul Bolle]

Joe, Andrew,

On Tue, 2015-01-20 at 14:25 -0800, Joe Perches wrote:
> If a git commit description is split on consecutive lines,
> coalesce it before testing.
> 
> This allows:
> 
>   commit <foo> ("some long
>   description")
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> Noticed-by: Paul Bolle <pebolle@tiscali.nl>

Works as advertised (ie, that particular commit explanation doesn't
trigger an error anymore). And Andrew M. already added it to the -mm
tree.

Thanks, both of you!


Paul Bolle

[PATCH v4] ARM: mvebu: remove two selects of ARM_ERRATA_753970

[Russell King - ARM Linux]

On Mon, Jan 19, 2015 at 10:32:17AM +0100, Paul Bolle wrote:
> ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
> commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
> PL310 errata workarounds"). Still, two selects were added in v3.15 that
> used the previous name. So these selects have always been nops.
> 
> It is clear that the intention here was to select PL310_ERRATA_753970.
> But as, apparently, nothing broke for four releases we can assume
> PL310_ERRATA_753970 isn't actually needed. So let's not rename these two
> selects but just drop them instead.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> v4: Do no bother anymore to rename these selects. I've tried to do that
> a few times ever since v3.15-rc1 was released. Last time, v3, was in
> https://lkml.org/lkml/2014/9/12/231 . And since the people who
> intruduced this issue apparently aren't bothered by it, neither should
> I. So just do the safe and easy thing, which is removing these two
> selects, as they are nops now.

It's really for those who introduced these select statements to decide
what they want to do about them - but in principle, I'd agree with you.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

[PATCH v4] ARM: mvebu: remove two selects of ARM_ERRATA_753970

[Gregory CLEMENT]

Hi Paul,

On 19/01/2015 10:32, Paul Bolle wrote:
> ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
> commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
> PL310 errata workarounds"). Still, two selects were added in v3.15 that
> used the previous name. So these selects have always been nops.
> 
> It is clear that the intention here was to select PL310_ERRATA_753970.
> But as, apparently, nothing broke for four releases we can assume
> PL310_ERRATA_753970 isn't actually needed. So let's not rename these two
> selects but just drop them instead.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> v4: Do no bother anymore to rename these selects. I've tried to do that
> a few times ever since v3.15-rc1 was released. Last time, v3, was in
> https://lkml.org/lkml/2014/9/12/231 . And since the people who
> intruduced this issue apparently aren't bothered by it, neither should
> I. So just do the safe and easy thing, which is removing these two
> selects, as they are nops now.
> 
> Done on top of next-20150119.

I think you're right, however I am still going to ask the hardware designers
if we need PL310_ERRATA_753970.

Thanks,

Gregory


> 
>  arch/arm/mach-mvebu/Kconfig | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index c1e4567a5ab3..e8e5fa25121c 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -37,7 +37,6 @@ config MACH_ARMADA_370
>  config MACH_ARMADA_375
>  	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
>  	select ARM_ERRATA_720789
> -	select ARM_ERRATA_753970
>  	select ARM_GIC
>  	select ARMADA_375_CLK
>  	select HAVE_ARM_SCU
> @@ -52,7 +51,6 @@ config MACH_ARMADA_375
>  config MACH_ARMADA_38X
>  	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
>  	select ARM_ERRATA_720789
> -	select ARM_ERRATA_753970
>  	select ARM_GIC
>  	select ARMADA_38X_CLK
>  	select HAVE_ARM_SCU
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com