x86: Convert remaining x86 clocksources to clocksource_register_hz/khz (b01cc1b0) · Commits · e / devices / android_kernel_fairphone_FP4

arch/x86/kernel/apb_timer.c

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -177,7 +177,6 @@ static struct clocksource clocksource_apbt = {
	.rating = APBT_CLOCKSOURCE_RATING,		.rating = APBT_CLOCKSOURCE_RATING,
	.read = apbt_read_clocksource,		.read = apbt_read_clocksource,
	.mask = APBT_MASK,		.mask = APBT_MASK,
	.shift = APBT_SHIFT,
	.flags = CLOCK_SOURCE_IS_CONTINUOUS,		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
	.resume = apbt_restart_clocksource,		.resume = apbt_restart_clocksource,
	};		};
	@@ -595,14 +594,7 @@ static int apbt_clocksource_register(void)
	if (t1 == apbt_read_clocksource(&clocksource_apbt))		if (t1 == apbt_read_clocksource(&clocksource_apbt))
	panic("APBT counter not counting. APBT disabled\n");		panic("APBT counter not counting. APBT disabled\n");

	/*		clocksource_register_khz(&clocksource_apbt, (u32)apbt_freq*1000);
	* initialize and register APBT clocksource
	* convert that to ns/clock cycle
	* mult = (ns/c) * 2^APBT_SHIFT
	*/
	clocksource_apbt.mult = div_sc(MSEC_PER_SEC,
	(unsigned long) apbt_freq, APBT_SHIFT);
	clocksource_register(&clocksource_apbt);

	return 0;		return 0;
	}		}

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -188,8 +188,6 @@ static struct clocksource pit_cs = {
	.rating = 110,		.rating = 110,
	.read = pit_read,		.read = pit_read,
	.mask = CLOCKSOURCE_MASK(32),		.mask = CLOCKSOURCE_MASK(32),
	.mult = 0,
	.shift = 20,
	};		};

	static int __init init_pit_clocksource(void)		static int __init init_pit_clocksource(void)
	@@ -205,9 +203,7 @@ static int __init init_pit_clocksource(void)
	pit_ce.mode != CLOCK_EVT_MODE_PERIODIC)		pit_ce.mode != CLOCK_EVT_MODE_PERIODIC)
	return 0;		return 0;

	pit_cs.mult = clocksource_hz2mult(CLOCK_TICK_RATE, pit_cs.shift);		return clocksource_register_hz(&pit_cs, CLOCK_TICK_RATE);

	return clocksource_register(&pit_cs);
	}		}
	arch_initcall(init_pit_clocksource);		arch_initcall(init_pit_clocksource);

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,6 @@
	#include <asm/x86_init.h>		#include <asm/x86_init.h>
	#include <asm/reboot.h>		#include <asm/reboot.h>

	#define KVM_SCALE 22

	static int kvmclock = 1;		static int kvmclock = 1;
	static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;		static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
	static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;		static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
	@@ -120,8 +118,6 @@ static struct clocksource kvm_clock = {
	.read = kvm_clock_get_cycles,		.read = kvm_clock_get_cycles,
	.rating = 400,		.rating = 400,
	.mask = CLOCKSOURCE_MASK(64),		.mask = CLOCKSOURCE_MASK(64),
	.mult = 1 << KVM_SCALE,
	.shift = KVM_SCALE,
	.flags = CLOCK_SOURCE_IS_CONTINUOUS,		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
	};		};

	@@ -203,7 +199,7 @@ void __init kvmclock_init(void)
	machine_ops.crash_shutdown = kvm_crash_shutdown;		machine_ops.crash_shutdown = kvm_crash_shutdown;
	#endif		#endif
	kvm_get_preset_lpj();		kvm_get_preset_lpj();
	clocksource_register(&kvm_clock);		clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
	pv_info.paravirt_enabled = 1;		pv_info.paravirt_enabled = 1;
	pv_info.name = "KVM";		pv_info.name = "KVM";

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -913,8 +913,6 @@ static struct clocksource lguest_clock = {
	.rating = 200,		.rating = 200,
	.read = lguest_clock_read,		.read = lguest_clock_read,
	.mask = CLOCKSOURCE_MASK(64),		.mask = CLOCKSOURCE_MASK(64),
	.mult = 1 << 22,
	.shift = 22,
	.flags = CLOCK_SOURCE_IS_CONTINUOUS,		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
	};		};

	@@ -997,7 +995,7 @@ static void lguest_time_init(void)
	/* Set up the timer interrupt (0) to go to our simple timer routine */		/* Set up the timer interrupt (0) to go to our simple timer routine */
	set_irq_handler(0, lguest_time_irq);		set_irq_handler(0, lguest_time_irq);

	clocksource_register(&lguest_clock);		clocksource_register_hz(&lguest_clock, NSEC_PER_SEC);

	/* We can't set cpumask in the initializer: damn C limitations! Set it		/* We can't set cpumask in the initializer: damn C limitations! Set it
	* here and register our timer device. */		* here and register our timer device. */

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@ static struct clocksource clocksource_uv = {
	.rating = 400,		.rating = 400,
	.read = uv_read_rtc,		.read = uv_read_rtc,
	.mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,		.mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,
	.shift = 10,
	.flags = CLOCK_SOURCE_IS_CONTINUOUS,		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
	};		};

	@@ -372,14 +371,11 @@ static __init int uv_rtc_setup_clock(void)
	if (!is_uv_system())		if (!is_uv_system())
	return -ENODEV;		return -ENODEV;

	clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
	clocksource_uv.shift);

	/* If single blade, prefer tsc */		/* If single blade, prefer tsc */
	if (uv_num_possible_blades() == 1)		if (uv_num_possible_blades() == 1)
	clocksource_uv.rating = 250;		clocksource_uv.rating = 250;

	rc = clocksource_register(&clocksource_uv);		rc = clocksource_register_hz(&clocksource_uv, sn_rtc_cycles_per_second);
	if (rc)		if (rc)
	printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);		printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
	else		else