瀏覽代碼

[ARM] 5004/1: Tosa: make several unreferenced structures static.

Now that scoop gpio's are converted to generic_gpio,
tosascoop_device and tosascoop_jc_device don't have
to be exported.

Also make tosa_gpio_* static

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Dmitry Baryshkov 17 年之前
父節點
當前提交
ba4eb7e60b
共有 2 個文件被更改,包括 4 次插入8 次删除
  1. 4 4
      arch/arm/mach-pxa/tosa.c
  2. 0 4
      include/asm-arm/arch-pxa/tosa.h

+ 4 - 4
arch/arm/mach-pxa/tosa.c

@@ -170,7 +170,7 @@ static struct scoop_config tosa_scoop_setup = {
 	.gpio_base	= TOSA_SCOOP_GPIO_BASE,
 };
 
-struct platform_device tosascoop_device = {
+static struct platform_device tosascoop_device = {
 	.name		= "sharp-scoop",
 	.id		= 0,
 	.dev		= {
@@ -197,7 +197,7 @@ static struct scoop_config tosa_scoop_jc_setup = {
 	.gpio_base	= TOSA_SCOOP_JC_GPIO_BASE,
 };
 
-struct platform_device tosascoop_jc_device = {
+static struct platform_device tosascoop_jc_device = {
 	.name		= "sharp-scoop",
 	.id		= 1,
 	.dev		= {
@@ -421,7 +421,7 @@ static struct platform_device tosa_gpio_keys_device = {
 /*
  * Tosa LEDs
  */
-struct gpio_led tosa_gpio_leds[] = {
+static struct gpio_led tosa_gpio_leds[] = {
 	{
 		.name			= "tosa:amber:charge",
 		.default_trigger	= "main-battery-charging",
@@ -434,7 +434,7 @@ struct gpio_led tosa_gpio_leds[] = {
 	},
 };
 
-struct gpio_led_platform_data tosa_gpio_leds_platform_data = {
+static struct gpio_led_platform_data tosa_gpio_leds_platform_data = {
 	.leds		= tosa_gpio_leds,
 	.num_leds	= ARRAY_SIZE(tosa_gpio_leds),
 };

+ 0 - 4
include/asm-arm/arch-pxa/tosa.h

@@ -151,12 +151,8 @@
 
 #define TOSA_IRQ_GPIO_MAIN_BAT_LOW 	IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW)
 
-extern struct platform_device tosascoop_jc_device;
-extern struct platform_device tosascoop_device;
-
 #define TOSA_KEY_SYNC		KEY_102ND /* ??? */
 
-
 #ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES
 #define TOSA_KEY_RECORD		KEY_YEN
 #define TOSA_KEY_ADDRESSBOOK	KEY_KATAKANA