[ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup

This trivial patch updates the nslu2 and nas-100d headers to
remove pointless GPIO defines, and updates nslu2-setup.c
accordingly. In addition minor style cleanups to some comments
are included.

Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 12 insertions, 10 deletions

diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 9a31444d9214..78a17413ceca 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -155,7 +155,8 @@ static void __init nas100d_init(void)
 
         pm_power_off = nas100d_power_off;
 
-        /* This is only useful on a modified machine, but it is valuable
+        /*
+         * This is only useful on a modified machine, but it is valuable
          * to have it first in order to see debug messages, and so that
          * it does *not* get removed if platform_add_devices fails!
          */
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index 1aa45a2e6d62..9bf8ccbcaccf 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -50,26 +50,26 @@ static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {
 static struct resource nslu2_led_resources[] = {
         {
                 .name           = "ready",  /* green led */
-                .start          = NSLU2_LED_GRN,
-                .end            = NSLU2_LED_GRN,
+                .start          = NSLU2_LED_GRN_GPIO,
+                .end            = NSLU2_LED_GRN_GPIO,
                 .flags          = IXP4XX_GPIO_HIGH,
         },
         {
                 .name           = "status", /* red led */
-                .start          = NSLU2_LED_RED,
-                .end            = NSLU2_LED_RED,
+                .start          = NSLU2_LED_RED_GPIO,
+                .end            = NSLU2_LED_RED_GPIO,
                 .flags          = IXP4XX_GPIO_HIGH,
         },
         {
                 .name           = "disk-1",
-                .start          = NSLU2_LED_DISK1,
-                .end            = NSLU2_LED_DISK1,
+                .start          = NSLU2_LED_DISK1_GPIO,
+                .end            = NSLU2_LED_DISK1_GPIO,
                 .flags          = IXP4XX_GPIO_LOW,
         },
         {
                 .name           = "disk-2",
-                .start          = NSLU2_LED_DISK2,
-                .end            = NSLU2_LED_DISK2,
+                .start          = NSLU2_LED_DISK2_GPIO,
+                .end            = NSLU2_LED_DISK2_GPIO,
                 .flags          = IXP4XX_GPIO_LOW,
         },
 };
@@ -181,7 +181,8 @@ static void __init nslu2_init(void)
 
         pm_power_off = nslu2_power_off;
 
-        /* This is only useful on a modified machine, but it is valuable
+        /*
+         * This is only useful on a modified machine, but it is valuable
          * to have it first in order to see debug messages, and so that
          * it does *not* get removed if platform_add_devices fails!
          */