diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-25 22:46:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:12 -0400 |
commit | 9580d85f9cdb076c4bfb467bc6c0d3c5e499957a (patch) | |
tree | ff746752ff4ce2bff2ae50cea345c1bbbe2b3ba7 | |
parent | 7c363b8c6536f26934172d3c46f0bbec01a97c61 (diff) |
drivers/char/rtc.c: make 2 functions static
The following functions can now become static:
- rtc_interrupt()
- rtc_get_rtc_time()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Bernhard Walle <bwalle@suse.de>
Acked-by: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/rtc.c | 5 | ||||
-rw-r--r-- | include/linux/rtc.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index dbefbb30ed44..d9799e2bcfbf 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
@@ -144,6 +144,7 @@ static ssize_t rtc_read(struct file *file, char __user *buf, | |||
144 | size_t count, loff_t *ppos); | 144 | size_t count, loff_t *ppos); |
145 | 145 | ||
146 | static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg); | 146 | static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg); |
147 | static void rtc_get_rtc_time(struct rtc_time *rtc_tm); | ||
147 | 148 | ||
148 | #ifdef RTC_IRQ | 149 | #ifdef RTC_IRQ |
149 | static unsigned int rtc_poll(struct file *file, poll_table *wait); | 150 | static unsigned int rtc_poll(struct file *file, poll_table *wait); |
@@ -235,7 +236,7 @@ static inline unsigned char rtc_is_updating(void) | |||
235 | * (See ./arch/XXXX/kernel/time.c for the set_rtc_mmss() function.) | 236 | * (See ./arch/XXXX/kernel/time.c for the set_rtc_mmss() function.) |
236 | */ | 237 | */ |
237 | 238 | ||
238 | irqreturn_t rtc_interrupt(int irq, void *dev_id) | 239 | static irqreturn_t rtc_interrupt(int irq, void *dev_id) |
239 | { | 240 | { |
240 | /* | 241 | /* |
241 | * Can be an alarm interrupt, update complete interrupt, | 242 | * Can be an alarm interrupt, update complete interrupt, |
@@ -1303,7 +1304,7 @@ static int rtc_proc_open(struct inode *inode, struct file *file) | |||
1303 | } | 1304 | } |
1304 | #endif | 1305 | #endif |
1305 | 1306 | ||
1306 | void rtc_get_rtc_time(struct rtc_time *rtc_tm) | 1307 | static void rtc_get_rtc_time(struct rtc_time *rtc_tm) |
1307 | { | 1308 | { |
1308 | unsigned long uip_watchdog = jiffies, flags; | 1309 | unsigned long uip_watchdog = jiffies, flags; |
1309 | unsigned char ctrl; | 1310 | unsigned char ctrl; |
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index b01fe004cb5e..91f597ad6acc 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
@@ -225,8 +225,6 @@ typedef struct rtc_task { | |||
225 | int rtc_register(rtc_task_t *task); | 225 | int rtc_register(rtc_task_t *task); |
226 | int rtc_unregister(rtc_task_t *task); | 226 | int rtc_unregister(rtc_task_t *task); |
227 | int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg); | 227 | int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg); |
228 | void rtc_get_rtc_time(struct rtc_time *rtc_tm); | ||
229 | irqreturn_t rtc_interrupt(int irq, void *dev_id); | ||
230 | 228 | ||
231 | #endif /* __KERNEL__ */ | 229 | #endif /* __KERNEL__ */ |
232 | 230 | ||