summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-07 03:34:41 -0800
committerKukjin Kim <kgene.kim@samsung.com>2012-03-07 03:34:41 -0800
commit60571f98d292b74586ff8330d8bc965eb01e8df0 (patch)
tree8d4f14f4a99b8b465828a314620f3b3aa030713f /arch/arm/mach-s3c2410
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff)
parent6d259a25b56d15ea3cb4b7f2195a188326812d88 (diff)
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
Conflicts: arch/arm/mach-exynos/dma.c arch/arm/mach-s5p64x0/dma.c arch/arm/mach-s5pc100/dma.c arch/arm/mach-s5pv210/dma.c
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/mach-h1940.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 41245a603981..6b21ba107eab 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -162,7 +162,7 @@ static int h1940_gpiolib_latch_get(struct gpio_chip *chip,
return (latch_state >> (offset + 16)) & 1;
}
-struct gpio_chip h1940_latch_gpiochip = {
+static struct gpio_chip h1940_latch_gpiochip = {
.base = H1940_LATCH_GPIO(0),
.owner = THIS_MODULE,
.label = "H1940_LATCH",
@@ -304,7 +304,7 @@ static const struct s3c_adc_bat_thresh bat_lut_acin[] = {
{ .volt = 3841, .cur = 0, .level = 0},
};
-int h1940_bat_init(void)
+static int h1940_bat_init(void)
{
int ret;
@@ -317,17 +317,17 @@ int h1940_bat_init(void)
}
-void h1940_bat_exit(void)
+static void h1940_bat_exit(void)
{
gpio_free(H1940_LATCH_SM803_ENABLE);
}
-void h1940_enable_charger(void)
+static void h1940_enable_charger(void)
{
gpio_set_value(H1940_LATCH_SM803_ENABLE, 1);
}
-void h1940_disable_charger(void)
+static void h1940_disable_charger(void)
{
gpio_set_value(H1940_LATCH_SM803_ENABLE, 0);
}
@@ -364,7 +364,7 @@ static struct platform_device h1940_battery = {
},
};
-DEFINE_SPINLOCK(h1940_blink_spin);
+static DEFINE_SPINLOCK(h1940_blink_spin);
int h1940_led_blink_set(unsigned gpio, int state,
unsigned long *delay_on, unsigned long *delay_off)