Skip to contentSkip to conversation

x86/apb_timer: drop unused TSC calibration

PATCH Applied Johan Hovold 2 participants 5 messages May 13, 2020 – May 27, 2020 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86/apb_timer: drop unused TSC calibration

Drop the APB-timer TSC calibration, which hasn't been used since the removal of Moorestown support by commit 1a8359e411eb ("x86/mid: Remove Intel Moorestown").

---
 arch/x86/include/asm/apb_timer.h |  2 --
 arch/x86/kernel/apb_timer.c      | 53 --------------------------------
 2 files changed, 55 deletions(-)
arch/x86/include/asm/apb_timer.h +0 -2
index 99bb207fc04c..0a9bf8b77a28 100644
@@ -28,7 +28,6 @@
 #define APBT_DEV_USED  1
 
 extern void apbt_time_init(void);
-extern unsigned long apbt_quick_calibrate(void);
 extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
 extern void apbt_setup_secondary_clock(void);
 
@@ -38,7 +37,6 @@ extern int sfi_mtimer_num;
 
 #else /* CONFIG_APB_TIMER */
 
-static inline unsigned long apbt_quick_calibrate(void) {return 0; }
 static inline void apbt_time_init(void) { }
 
 #endif
arch/x86/kernel/apb_timer.c +0 -53

56 lines not on this page · raw message

Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 x86/apb_timer: drop unused declaration and macro

Drop an extern declaration that has never been used and a no longer needed macro.

---
 arch/x86/include/asm/apb_timer.h | 3 ---
 1 file changed, 3 deletions(-)
arch/x86/include/asm/apb_timer.h +0 -3
index 0a9bf8b77a28..87ce8e963215 100644
@@ -25,10 +25,7 @@
 #define APBT_MIN_FREQ          1000000
 #define APBT_MMAP_SIZE         1024
 
-#define APBT_DEV_USED  1
-
 extern void apbt_time_init(void);
-extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
 extern void apbt_setup_secondary_clock(void);
 
 extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint);
Signature · 1 line
2.26.2
merge bot Applied
#2 lore raw

[tip: x86/cleanups] x86/apb_timer: Drop unused declaration and macro

The following commit has been merged into the x86/cleanups branch of tip:

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     e027a2bc934fd05d52ec5b77d159efdfc485b5b3
Gitweb:        https://git.kernel.org/tip/e027a2bc934fd05d52ec5b77d159efdfc485b5b3
Author:        Johan Hovold <[email protected]>
AuthorDate:    Wed, 13 May 2020 12:09:44 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 27 May 2020 13:12:49 +02:00

x86/apb_timer: Drop unused declaration and macro

Drop an extern declaration that has never been used and a no longer needed macro.

---
 arch/x86/include/asm/apb_timer.h | 3 ---
 1 file changed, 3 deletions(-)
arch/x86/include/asm/apb_timer.h +0 -3
index 0a9bf8b..87ce8e9 100644
@@ -25,10 +25,7 @@
 #define APBT_MIN_FREQ          1000000
 #define APBT_MMAP_SIZE         1024
 
-#define APBT_DEV_USED  1
-
 extern void apbt_time_init(void);
-extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
 extern void apbt_setup_secondary_clock(void);
 
 extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint);
#3 lore raw
In reply to Johan Hovold
Quoted 9 lines · Johan Hovold

Drop the APB-timer TSC calibration, which hasn't been used since the removal of Moorestown support by commit 1a8359e411eb ("x86/mid: Remove Intel Moorestown").

---
 arch/x86/include/asm/apb_timer.h |  2 --
 arch/x86/kernel/apb_timer.c      | 53 --------------------------------
 2 files changed, 55 deletions(-)

Any comments to these two clean ups?

Johan

merge bot Applied
#4 lore raw

[tip: x86/cleanups] x86/apb_timer: Drop unused TSC calibration

In reply to Johan Hovold
The following commit has been merged into the x86/cleanups branch of tip:

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     003d80535180f74f262c40462b9fccd7f004901a
Gitweb:        https://git.kernel.org/tip/003d80535180f74f262c40462b9fccd7f004901a
Author:        Johan Hovold <[email protected]>
AuthorDate:    Wed, 13 May 2020 12:09:43 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 27 May 2020 13:05:59 +02:00

x86/apb_timer: Drop unused TSC calibration

Drop the APB-timer TSC calibration, which hasn't been used since the removal of Moorestown support by commit

1a8359e411eb ("x86/mid: Remove Intel Moorestown").

---
 arch/x86/include/asm/apb_timer.h |  2 +-
 arch/x86/kernel/apb_timer.c      | 53 +-------------------------------
 2 files changed, 55 deletions(-)
arch/x86/include/asm/apb_timer.h +0 -2
index 99bb207..0a9bf8b 100644
@@ -28,7 +28,6 @@
 #define APBT_DEV_USED  1
 
 extern void apbt_time_init(void);
-extern unsigned long apbt_quick_calibrate(void);
 extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
 extern void apbt_setup_secondary_clock(void);
 
@@ -38,7 +37,6 @@ extern int sfi_mtimer_num;
 
 #else /* CONFIG_APB_TIMER */
 
-static inline unsigned long apbt_quick_calibrate(void) {return 0; }
 static inline void apbt_time_init(void) { }
 
 #endif
arch/x86/kernel/apb_timer.c +0 -53

56 lines not on this page · raw message