2008-02-27 21:21:30

by Adrian Bunk

Subject: [2.6 patch] 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 <[email protected]>

---

This patch has been sent on:
- 13 Feb 2008

drivers/char/rtc.c | 5 +++--
include/linux/rtc.h | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)

e642155f0065ec03a83ed95eef2a78f272e73e01
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 78b151c..39aba90 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,

static int rtc_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
+static void rtc_get_rtc_time(struct rtc_time *rtc_tm);

#ifdef RTC_IRQ
static unsigned int rtc_poll(struct file *file, poll_table *wait);
@@ -235,7 +236,7 @@ static inline unsigned char rtc_is_updating(void)
* (See ./arch/XXXX/kernel/time.c for the set_rtc_mmss() function.)
*/

-irqreturn_t rtc_interrupt(int irq, void *dev_id)
+static irqreturn_t rtc_interrupt(int irq, void *dev_id)
{
/*
* Can be an alarm interrupt, update complete interrupt,
@@ -1298,7 +1299,7 @@ static int rtc_proc_open(struct inode *inode, struct file *file)
}
#endif

-void rtc_get_rtc_time(struct rtc_time *rtc_tm)
+static void rtc_get_rtc_time(struct rtc_time *rtc_tm)
{
unsigned long uip_watchdog = jiffies, flags;
unsigned char ctrl;
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index f2d0d15..1fc4f60 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -208,8 +208,6 @@ typedef struct rtc_task {
int rtc_register(rtc_task_t *task);
int rtc_unregister(rtc_task_t *task);
int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg);
-void rtc_get_rtc_time(struct rtc_time *rtc_tm);
-irqreturn_t rtc_interrupt(int irq, void *dev_id);

#endif /* __KERNEL__ */

2008-02-27 21:40:54

by Bernhard Walle

Subject: Re: [2.6 patch] drivers/char/rtc.c: make 2 functions static

* Adrian Bunk <[email protected]> [2008-02-27 22:20]:
> The following functions can now become static:
> - rtc_interrupt()
> - rtc_get_rtc_time()
>
> Signed-off-by: Adrian Bunk <[email protected]>

Of course:

Acked-by: Bernhard Walle <[email protected]>

But I'm not the maintainer of RTC ...