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

Commit 151766fc authored by Feng Tang's avatar Feng Tang Committed by Thomas Gleixner
Browse files

Revert "x86/platform: Add a wallclock_init func to x86_platforms ops" 



This reverts commit cf8ff6b6.

Just found this commit is a function duplicatation of commit 6b617e22
"x86/platform: Add a wallclock_init func to x86_init.timers ops".
Let's revert it and sorry for the noise.

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f9369910

arch/x86/include/asm/x86_init.h

+0 −2
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct x86_cpuinit_ops { 
/**

 * struct x86_platform_ops - platform specific runtime functions

 * @calibrate_tsc:		calibrate TSC

 * @wallclock_init:		init the wallclock device

 * @get_wallclock:		get time from HW clock like RTC etc.

 * @set_wallclock:		set time back to HW clock

 * @is_untracked_pat_range	exclude from PAT logic
@@ -167,7 +166,6 @@ struct x86_cpuinit_ops { 
 */

struct x86_platform_ops {

	unsigned long (*calibrate_tsc)(void);

	void (*wallclock_init)(void);

	unsigned long (*get_wallclock)(void);

	int (*set_wallclock)(unsigned long nowtime);

	void (*iommu_shutdown)(void);

arch/x86/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -1027,8 +1027,6 @@ void __init setup_arch(char **cmdline_p) 


	x86_init.timers.wallclock_init();



	x86_platform.wallclock_init();



	mcheck_init();



	arch_init_ideal_nops();

arch/x86/kernel/x86_init.c

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ void __init x86_init_uint_noop(unsigned int unused) { } 
void __init x86_init_pgd_noop(pgd_t *unused) { }

int __init iommu_init_noop(void) { return 0; }

void iommu_shutdown_noop(void) { }

void wallclock_init_noop(void) { }



/*

 * The platform setup functions are preset with the default functions
@@ -101,7 +100,6 @@ static int default_i8042_detect(void) { return 1; }; 


struct x86_platform_ops x86_platform = {

	.calibrate_tsc			= native_calibrate_tsc,

	.wallclock_init			= wallclock_init_noop,

	.get_wallclock			= mach_get_cmos_time,

	.set_wallclock			= mach_set_rtc_mmss,

	.iommu_shutdown			= iommu_shutdown_noop,