Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2752549 authored by John Stultz's avatar John Stultz Committed by Linus Torvalds
Browse files

[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: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5d0cf410

arch/i386/kernel/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/i386/kernel/i8253.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/i386/kernel/tsc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/clocksource/acpi_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/clocksource/cyclone.c

+1 −1
Original line number Diff line number Diff line
@@ -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);