[PATCH] time: rename clocksource functions

As suggested by Roman Zippel, change clocksource functions to use
clocksource_xyz rather then xyz_clocksource to avoid polluting the
namespace.

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index 91a5bdd9f604c844be7d060d599357cd9c9ff13c..23e7d2c5d25315eefae9b1bbbe3aafd0a2c279d4 100644 (file)
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
@@ -61,7 +61,7 @@ static int __init init_hpet_clocksource(void)
        do_div(tmp, FSEC_PER_NSEC);
        clocksource_hpet.mult = (u32)tmp;
 
-       return register_clocksource(&clocksource_hpet);
+       return clocksource_register(&clocksource_hpet);
 }
 
 module_init(init_hpet_clocksource);

diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c
index a276bceade68e2481f680e87facd9ab36b3df443..5b13739a7ff49e79e2e9f3cb840a862e84a0353a 100644 (file)
--- a/arch/i386/kernel/i8253.c
+++ b/arch/i386/kernel/i8253.c
@@ -80,6 +80,6 @@ static int __init init_pit_clocksource(void)
                return 0;
 
        clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20);
-       return register_clocksource(&clocksource_pit);
+       return clocksource_register(&clocksource_pit);
 }
 module_init(init_pit_clocksource);

diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index 7713f86389afd76bda7d7848c11a5831894e8379..1c3c927755de996447266cc4eaea4004c4b8ff77 100644 (file)
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -351,7 +351,7 @@ static int tsc_update_callback(void)
        /* check to see if we should switch to the safe clocksource: */
        if (clocksource_tsc.rating != 50 && check_tsc_unstable()) {
                clocksource_tsc.rating = 50;
-               reselect_clocksource();
+               clocksource_reselect();
                change = 1;
        }
 
@@ -469,7 +469,7 @@ static int __init init_tsc_clocksource(void)
                        jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL);
                add_timer(&verify_tsc_freq_timer);
 
-               return register_clocksource(&clocksource_tsc);
+               return clocksource_register(&clocksource_tsc);
        }
 
        return 0;

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index a0e5cde2fa7158d367f9226a44fd20441151b719..9217be5048d53f795db98851bbfabaa67aee6d44 100644 (file)
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -171,7 +171,7 @@ static int __init init_acpi_pm_clocksource(void)
        return -ENODEV;
 
 pm_good:
-       return register_clocksource(&clocksource_acpi_pm);
+       return clocksource_register(&clocksource_acpi_pm);
 }
 
 module_init(init_acpi_pm_clocksource);

diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c
index 444eb11b9b4f1d2b8726491dd69f310dce901262..5906a0af825dcffe7c7c3f45b4e7bfd5cba3b506 100644 (file)
--- a/drivers/clocksource/cyclone.c
+++ b/drivers/clocksource/cyclone.c
@@ -113,7 +113,7 @@ static int __init init_cyclone_clocksource(void)
        clocksource_cyclone.mult = clocksource_hz2mult(CYCLONE_TIMER_FREQ,
                                                clocksource_cyclone.shift);
 
-       return register_clocksource(&clocksource_cyclone);
+       return clocksource_register(&clocksource_cyclone);
 }
 
 module_init(init_cyclone_clocksource);

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index c4739c4e303993c354a124965a3d50b74bdf4214..5f4a7f72f3ee4adc4729dfdedd71f227091d70a0 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -118,12 +118,12 @@ static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
 }
 
 /**
- * read_clocksource: - Access the clocksource's current cycle value
+ * clocksource_read: - Access the clocksource's current cycle value
  * @cs:                pointer to clocksource being read
  *
  * Uses the clocksource to return the current cycle_t value
  */
-static inline cycle_t read_clocksource(struct clocksource *cs)
+static inline cycle_t clocksource_read(struct clocksource *cs)
 {
        return cs->read();
 }
@@ -145,7 +145,7 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
 }
 
 /**
- * calculate_clocksource_interval - Calculates a clocksource interval struct
+ * clocksource_calculate_interval - Calculates a clocksource interval struct
  *
  * @c:         Pointer to clocksource.
  * @length_nsec: Desired interval length in nanoseconds.
@@ -155,7 +155,7 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
  *
  * Unless you're the timekeeping code, you should not be using this!
  */
-static inline void calculate_clocksource_interval(struct clocksource *c,
+static inline void clocksource_calculate_interval(struct clocksource *c,
                                                unsigned long length_nsec)
 {
        u64 tmp;
@@ -271,8 +271,8 @@ static inline s64 make_ntp_adj(struct clocksource *clock,
 
 
 /* used to install a new clocksource */
-int register_clocksource(struct clocksource*);
-void reselect_clocksource(void);
-struct clocksource* get_next_clocksource(void);
+int clocksource_register(struct clocksource*);
+void clocksource_reselect(void);
+struct clocksource* clocksource_get_next(void);
 
 #endif /* _LINUX_CLOCKSOURCE_H */

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index a9f387ea83b0a52181b0f10ddb10c63ccd1ea2e7..74eca5939bd989af76da55213ed5ae634ed9f6bd 100644 (file)
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -65,10 +65,10 @@ static int __init clocksource_done_booting(void)
 late_initcall(clocksource_done_booting);
 
 /**
- * get_next_clocksource - Returns the selected clocksource
+ * clocksource_get_next - Returns the selected clocksource
  *
  */
-struct clocksource *get_next_clocksource(void)
+struct clocksource *clocksource_get_next(void)
 {
        unsigned long flags;
 
@@ -142,12 +142,12 @@ static int is_registered_source(struct clocksource *c)
 }
 
 /**
- * register_clocksource - Used to install new clocksources
+ * clocksource_register - Used to install new clocksources
  * @t:         clocksource to be registered
  *
  * Returns -EBUSY if registration fails, zero otherwise.
  */
-int register_clocksource(struct clocksource *c)
+int clocksource_register(struct clocksource *c)
 {
        int ret = 0;
        unsigned long flags;
@@ -167,17 +167,16 @@ int register_clocksource(struct clocksource *c)
        spin_unlock_irqrestore(&clocksource_lock, flags);
        return ret;
 }
-
-EXPORT_SYMBOL(register_clocksource);
+EXPORT_SYMBOL(clocksource_register);
 
 /**
- * reselect_clocksource - Rescan list for next clocksource
+ * clocksource_reselect - Rescan list for next clocksource
  *
  * A quick helper function to be used if a clocksource changes its
  * rating. Forces the clocksource list to be re-scanned for the best
  * clocksource.
  */
-void reselect_clocksource(void)
+void clocksource_reselect(void)
 {
        unsigned long flags;
 
@@ -185,6 +184,7 @@ void reselect_clocksource(void)
        next_clocksource = select_clocksource();
        spin_unlock_irqrestore(&clocksource_lock, flags);
 }
+EXPORT_SYMBOL(clocksource_reselect);
 
 /**
  * sysfs_show_current_clocksources - sysfs interface for current clocksource

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 1fe8376e717bba652de252c866a9c59fa127117b..126bb30c4afe42b01b78945d2105033f994979b3 100644 (file)
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -67,7 +67,7 @@ struct clocksource clocksource_jiffies = {
 
 static int __init init_jiffies_clocksource(void)
 {
-       return register_clocksource(&clocksource_jiffies);
+       return clocksource_register(&clocksource_jiffies);
 }
 
 module_init(init_jiffies_clocksource);

diff --git a/kernel/timer.c b/kernel/timer.c
index e5adb9e2e7a797ad4ad0330bf8e56e0bf2089d39..890a56937cfa3ef334b72663ad330cd5bf724ce8 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -810,7 +810,7 @@ static inline s64 __get_nsec_offset(void)
        s64 ns_offset;
 
        /* read clocksource: */
-       cycle_now = read_clocksource(clock);
+       cycle_now = clocksource_read(clock);
 
        /* calculate the delta since the last update_wall_time: */
        cycle_delta = (cycle_now - last_clock_cycle) & clock->mask;
@@ -845,7 +845,7 @@ static inline void __get_realtime_clock_ts(struct timespec *ts)
 }
 
 /**
- * get_realtime_clock_ts - Returns the time of day in a timespec
+ * getnstimeofday - Returns the time of day in a timespec
  * @ts:                pointer to the timespec to be set
  *
  * Returns the time of day in a timespec.
@@ -920,9 +920,9 @@ static int change_clocksource(void)
        struct clocksource *new;
        cycle_t now;
        u64 nsec;
-       new = get_next_clocksource();
+       new = clocksource_get_next();
        if (clock != new) {
-               now = read_clocksource(new);
+               now = clocksource_read(new);
                nsec =  __get_nsec_offset();
                timespec_add_ns(&xtime, nsec);
 
@@ -966,9 +966,9 @@ void __init timekeeping_init(void)
        unsigned long flags;
 
        write_seqlock_irqsave(&xtime_lock, flags);
-       clock = get_next_clocksource();
-       calculate_clocksource_interval(clock, tick_nsec);
-       last_clock_cycle = read_clocksource(clock);
+       clock = clocksource_get_next();
+       clocksource_calculate_interval(clock, tick_nsec);
+       last_clock_cycle = clocksource_read(clock);
        ntp_clear();
        write_sequnlock_irqrestore(&xtime_lock, flags);
 }
@@ -988,7 +988,7 @@ static int timekeeping_resume(struct sys_device *dev)
 
        write_seqlock_irqsave(&xtime_lock, flags);
        /* restart the last cycle value */
-       last_clock_cycle = read_clocksource(clock);
+       last_clock_cycle = clocksource_read(clock);
        write_sequnlock_irqrestore(&xtime_lock, flags);
        return 0;
 }
@@ -1028,7 +1028,7 @@ static void update_wall_time(void)
        snsecs_per_sec = (s64)NSEC_PER_SEC << clock->shift;
        remainder_snsecs += (s64)xtime.tv_nsec << clock->shift;
 
-       now = read_clocksource(clock);
+       now = clocksource_read(clock);
        offset = (now - last_clock_cycle)&clock->mask;
 
        /* normally this loop will run just once, however in the
@@ -1069,7 +1069,7 @@ static void update_wall_time(void)
        if (change_clocksource()) {
                error = 0;
                remainder_snsecs = 0;
-               calculate_clocksource_interval(clock, tick_nsec);
+               clocksource_calculate_interval(clock, tick_nsec);
        }
 }