diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-07 17:45:28 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-07 17:45:28 -0500 |
commit | 62f383435932ea3d271bee6b957de048452c1b16 (patch) | |
tree | 4e5c886224d9b54d69f5c50d55f8a7b63e2ab4cc /arch/arm/mach-s3c2410 | |
parent | 4d02be5a6550ebf09936802c2cb8d359ce1ab29c (diff) | |
parent | 60571f98d292b74586ff8330d8bc965eb01e8df0 (diff) |
Merge branch 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
* 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: use static declaration when it is not used in other files
ARM: S5PV210: use static declaration when it is not used in other files
ARM: S5PC100: use static declaration when it is not used in other files
ARM: S5P64X0: use static declaration when it is not used in other files
ARM: S3C64XX: use static declaration when it is not used in other files
ARM: S3C24XX: use static declaration when it is not used in other files
ARM: EXYNOS: use static declaration when it is not used in other files
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 12 |
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, | |||
162 | return (latch_state >> (offset + 16)) & 1; | 162 | return (latch_state >> (offset + 16)) & 1; |
163 | } | 163 | } |
164 | 164 | ||
165 | struct gpio_chip h1940_latch_gpiochip = { | 165 | static struct gpio_chip h1940_latch_gpiochip = { |
166 | .base = H1940_LATCH_GPIO(0), | 166 | .base = H1940_LATCH_GPIO(0), |
167 | .owner = THIS_MODULE, | 167 | .owner = THIS_MODULE, |
168 | .label = "H1940_LATCH", | 168 | .label = "H1940_LATCH", |
@@ -304,7 +304,7 @@ static const struct s3c_adc_bat_thresh bat_lut_acin[] = { | |||
304 | { .volt = 3841, .cur = 0, .level = 0}, | 304 | { .volt = 3841, .cur = 0, .level = 0}, |
305 | }; | 305 | }; |
306 | 306 | ||
307 | int h1940_bat_init(void) | 307 | static int h1940_bat_init(void) |
308 | { | 308 | { |
309 | int ret; | 309 | int ret; |
310 | 310 | ||
@@ -317,17 +317,17 @@ int h1940_bat_init(void) | |||
317 | 317 | ||
318 | } | 318 | } |
319 | 319 | ||
320 | void h1940_bat_exit(void) | 320 | static void h1940_bat_exit(void) |
321 | { | 321 | { |
322 | gpio_free(H1940_LATCH_SM803_ENABLE); | 322 | gpio_free(H1940_LATCH_SM803_ENABLE); |
323 | } | 323 | } |
324 | 324 | ||
325 | void h1940_enable_charger(void) | 325 | static void h1940_enable_charger(void) |
326 | { | 326 | { |
327 | gpio_set_value(H1940_LATCH_SM803_ENABLE, 1); | 327 | gpio_set_value(H1940_LATCH_SM803_ENABLE, 1); |
328 | } | 328 | } |
329 | 329 | ||
330 | void h1940_disable_charger(void) | 330 | static void h1940_disable_charger(void) |
331 | { | 331 | { |
332 | gpio_set_value(H1940_LATCH_SM803_ENABLE, 0); | 332 | gpio_set_value(H1940_LATCH_SM803_ENABLE, 0); |
333 | } | 333 | } |
@@ -364,7 +364,7 @@ static struct platform_device h1940_battery = { | |||
364 | }, | 364 | }, |
365 | }; | 365 | }; |
366 | 366 | ||
367 | DEFINE_SPINLOCK(h1940_blink_spin); | 367 | static DEFINE_SPINLOCK(h1940_blink_spin); |
368 | 368 | ||
369 | int h1940_led_blink_set(unsigned gpio, int state, | 369 | int h1940_led_blink_set(unsigned gpio, int state, |
370 | unsigned long *delay_on, unsigned long *delay_off) | 370 | unsigned long *delay_on, unsigned long *delay_off) |