Commit 70802807 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Peter Zijlstra
Browse files

clockevents: Remove redundant CLOCK_EVT_FEAT_KTIME 



The only real usecase for this is the hrtimer based broadcast device.
No point in using two different feature flags for this.

Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260224163429.609049777@kernel.org
parent adcec6a7

include/linux/clockchips.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ enum clock_event_state { 
 */

# define CLOCK_EVT_FEAT_PERIODIC	0x000001

# define CLOCK_EVT_FEAT_ONESHOT		0x000002

# define CLOCK_EVT_FEAT_KTIME		0x000004



/*

 * x86(64) specific (mis)features:

kernel/time/clockevents.c

+2 −2
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, 
	WARN_ONCE(!clockevent_state_oneshot(dev), "Current state: %d\n",

		  clockevent_get_state(dev));



	/* Shortcut for clockevent devices that can deal with ktime. */

	if (dev->features & CLOCK_EVT_FEAT_KTIME)

	/* ktime_t based reprogramming for the broadcast hrtimer device */

	if (unlikely(dev->features & CLOCK_EVT_FEAT_HRTIMER))

		return dev->set_next_ktime(expires, dev);



	delta = ktime_to_ns(ktime_sub(expires, ktime_get()));

kernel/time/tick-broadcast-hrtimer.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static struct clock_event_device ce_broadcast_hrtimer = { 
	.set_state_shutdown	= bc_shutdown,

	.set_next_ktime		= bc_set_next,

	.features		= CLOCK_EVT_FEAT_ONESHOT |

				  CLOCK_EVT_FEAT_KTIME |

				  CLOCK_EVT_FEAT_HRTIMER,

	.rating			= 0,

	.bound_on		= -1,