ARM: config: sort select statements alphanumerically

As suggested by Andrew Morton:

  This is a pet peeve of mine.  Any time there's a long list of items
  (header file inclusions, kconfig entries, array initalisers, etc) and
  someone wants to add a new item, they *always* go and stick it at the
  end of the list.

  Guys, don't do this.  Either put the new item into a randomly-chosen
  position or, probably better, alphanumerically sort the list.

lets sort all our select statements alphanumerically.  This commit was
created by the following perl:

while (<>) {
	while (/\\\s*$/) {
		$_ .= <>;
	}
	undef %selects if /^\s*config\s+/;
	if (/^\s+select\s+(\w+).*/) {
		if (defined($selects{$1})) {
			if ($selects{$1} eq $_) {
				print STDERR "Warning: removing duplicated $1 entry\n";
			} else {
				print STDERR "Error: $1 differently selected\n".
					"\tOld: $selects{$1}\n".
					"\tNew: $_\n";
				exit 1;
			}
		}
		$selects{$1} = $_;
		next;
	}
	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
			  /^endif/ or /^endchoice/)) {
		foreach $k (sort (keys %selects)) {
			print "$selects{$k}";
		}
		undef %selects;
	}
	print;
}
if (%selects) {
	foreach $k (sort (keys %selects)) {
		print "$selects{$k}";
	}
}

It found two duplicates:

Warning: removing duplicated S5P_SETUP_MIPIPHY entry
Warning: removing duplicated HARDIRQS_SW_RESEND entry

and they are identical duplicates, hence the shrinkage in the diffstat
of two lines.

We have four testers reporting success of this change (Tony, Stephen,
Linus and Sekhar.)

Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4cacc2d22fbe..8ae100cc655c 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,49 +4,49 @@ comment "SH-Mobile System Type"
 
 config ARCH_SH7367
         bool "SH-Mobile G3 (SH7367)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V6
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7377
         bool "SH-Mobile G4 (SH7377)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V7
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7372
         bool "SH-Mobile AP4 (SH7372)"
-        select CPU_V7
-        select SH_CLK_CPG
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_CPU_SUSPEND if PM || CPU_IDLE
+        select CPU_V7
+        select SH_CLK_CPG
 
 config ARCH_SH73A0
         bool "SH-Mobile AG5 (R8A73A00)"
-        select CPU_V7
-        select SH_CLK_CPG
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
+        select CPU_V7
         select I2C
+        select SH_CLK_CPG
 
 config ARCH_R8A7740
         bool "R-Mobile A1 (R8A77400)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V7
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_R8A7779
         bool "R-Car H1 (R8A77790)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
         select CPU_V7
         select SH_CLK_CPG
-        select ARM_GIC
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_EMEV2
         bool "Emma Mobile EV2"
-        select CPU_V7
-        select ARM_GIC
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
+        select CPU_V7
 
 comment "SH-Mobile Board Type"
 
@@ -65,9 +65,9 @@ config MACH_AP4EVB
         bool "AP4EVB board"
         depends on ARCH_SH7372
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SH_LCD_MIPI_DSI
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 choice
         prompt "AP4EVB LCD panel selection"
@@ -84,37 +84,37 @@ endchoice
 
 config MACH_AG5EVM
         bool "AG5EVM board"
+        depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
-        select SH_LCD_MIPI_DSI
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
+        select SH_LCD_MIPI_DSI
 
 config MACH_MACKEREL
         bool "mackerel board"
         depends on ARCH_SH7372
         select ARCH_REQUIRE_GPIOLIB
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 config MACH_KOTA2
         bool "KOTA2 board"
+        depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
 
 config MACH_BONITO
         bool "bonito board"
+        depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_R8A7740
 
 config MACH_ARMADILLO800EVA
         bool "Armadillo-800 EVA board"
         depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SND_SOC_WM8978 if SND_SIMPLE_CARD
+        select USE_OF
 
 config MACH_MARZEN
         bool "MARZEN board"
@@ -125,16 +125,16 @@ config MACH_MARZEN
 config MACH_KZM9D
         bool "KZM9D board"
         depends on ARCH_EMEV2
-        select USE_OF
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
 
 config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select USE_OF
 
 comment "SH-Mobile System Configuration"