浏览代码

[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.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Daniel Mack 15 年之前
父节点
当前提交
299ed07868
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      arch/arm/mach-pxa/raumfeld.c

+ 2 - 3
arch/arm/mach-pxa/raumfeld.c

@@ -983,7 +983,7 @@ static void __init raumfeld_common_init(void)
 		int i;
 		int i;
 
 
 		for (i = 0; i < ARRAY_SIZE(gpio_keys_button); 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;
 				gpio_keys_button[i].active_low = 1;
 	}
 	}
 
 
@@ -1009,8 +1009,7 @@ static void __init raumfeld_common_init(void)
 		gpio_direction_output(GPIO_W2W_PDN, 0);
 		gpio_direction_output(GPIO_W2W_PDN, 0);
 
 
 	/* this can be used to switch off the device */
 	/* 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)
 	if (ret < 0)
 		pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
 		pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
 	else
 	else