Skip to contentSkip to conversation

ARM: pxa/raumfeld: fix button name

PATCH New Daniel Mack 2 participants 5 messages Apr 18, 2010 – Apr 27, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: pxa/raumfeld: fix button name

"on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well.

While at it, fix another cosmetic coding style flaw as well.

---
 arch/arm/mach-pxa/raumfeld.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/raumfeld.c +2 -3
index 3bbc2d8..7582a12 100644
@@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
 		int i;
 
 		for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
-			if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+			if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
 				gpio_keys_button[i].active_low = 1;
 	}
 
@@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
 		gpio_direction_output(GPIO_W2W_PDN, 0);
 
 	/* this can be used to switch off the device */
-	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
-				"supply shutdown");
+	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
 	if (ret < 0)
 		pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
 	else
Signature · 1 line
1.7.0.3
#1 lore raw

PATCH 1/1 ARM: pxa/raumfeld: fix button name

Quoted 7 lines · Daniel Mack

"on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well.

While at it, fix another cosmetic coding style flaw as well.

Eric, can you apply this? Would be nice to have it in .34, but not totally mandatory.

Thanks,
Daniel

Quoted 30 lines
---
 arch/arm/mach-pxa/raumfeld.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/raumfeld.c +2 -3
index 3bbc2d8..7582a12 100644
@@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
 		int i;
 
 		for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
-			if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+			if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
 				gpio_keys_button[i].active_low = 1;
 	}
 
@@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
 		gpio_direction_output(GPIO_W2W_PDN, 0);
 
 	/* this can be used to switch off the device */
-	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
-				"supply shutdown");
+	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
 	if (ret < 0)
 		pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
 	else
Signature · 1 line
1.7.0.3
#2 lore raw

PATCH 1/1 ARM: pxa/raumfeld: fix button name

Ping?

Quoted 51 lines · Daniel Mack
Quoted 7 lines · Daniel Mack

"on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well.

While at it, fix another cosmetic coding style flaw as well.

Eric, can you apply this? Would be nice to have it in .34, but not totally mandatory.

Thanks,
Daniel

Quoted 30 lines
---
 arch/arm/mach-pxa/raumfeld.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/raumfeld.c +2 -3
index 3bbc2d8..7582a12 100644
@@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
 		int i;
 
 		for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
-			if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+			if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
 				gpio_keys_button[i].active_low = 1;
 	}
 
@@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
 		gpio_direction_output(GPIO_W2W_PDN, 0);
 
 	/* this can be used to switch off the device */
-	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
-				"supply shutdown");
+	ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
 	if (ret < 0)
 		pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
 	else
Signature · 1 line
1.7.0.3

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

PATCH 1/1 ARM: pxa/raumfeld: fix button name

Quoted 2 lines · Daniel Mack

Ping?

Mind if I put it to the queue of the next merge window?

#4 lore raw

PATCH 1/1 ARM: pxa/raumfeld: fix button name

Quoted 5 lines · Eric Miao
Quoted 2 lines · Daniel Mack

Ping?

Mind if I put it to the queue of the next merge window?

No problem. Thanks!

Daniel