Skip to content

Commit

Permalink
clockevents: Rename state to state_use_accessors
Browse files Browse the repository at this point in the history
The only sensible way to make abuse of core internal fields obvious
and easy to grep for.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
  • Loading branch information
Thomas Gleixner committed Jun 2, 2015
1 parent 051ebd1 commit be3ef76
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions include/linux/clockchips.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ enum clock_event_state {
* @mult: nanosecond to cycles multiplier
* @shift: nanoseconds to cycles divisor (power of two)
* @mode: operating mode, relevant only to ->set_mode(), OBSOLETE
* @state: current state of the device, assigned by the core code
* @state_use_accessors:current state of the device, assigned by the core code
* @features: features
* @retries: number of forced programming retries
* @set_mode: legacy set mode function, only for modes <= CLOCK_EVT_MODE_RESUME.
Expand Down Expand Up @@ -117,7 +117,7 @@ struct clock_event_device {
u32 mult;
u32 shift;
enum clock_event_mode mode;
enum clock_event_state state;
enum clock_event_state state_use_accessors;
unsigned int features;
unsigned long retries;

Expand Down Expand Up @@ -152,27 +152,27 @@ struct clock_event_device {
/* Helpers to verify state of a clockevent device */
static inline bool clockevent_state_detached(struct clock_event_device *dev)
{
return dev->state == CLOCK_EVT_STATE_DETACHED;
return dev->state_use_accessors == CLOCK_EVT_STATE_DETACHED;
}

static inline bool clockevent_state_shutdown(struct clock_event_device *dev)
{
return dev->state == CLOCK_EVT_STATE_SHUTDOWN;
return dev->state_use_accessors == CLOCK_EVT_STATE_SHUTDOWN;
}

static inline bool clockevent_state_periodic(struct clock_event_device *dev)
{
return dev->state == CLOCK_EVT_STATE_PERIODIC;
return dev->state_use_accessors == CLOCK_EVT_STATE_PERIODIC;
}

static inline bool clockevent_state_oneshot(struct clock_event_device *dev)
{
return dev->state == CLOCK_EVT_STATE_ONESHOT;
return dev->state_use_accessors == CLOCK_EVT_STATE_ONESHOT;
}

static inline bool clockevent_state_oneshot_stopped(struct clock_event_device *dev)
{
return dev->state == CLOCK_EVT_STATE_ONESHOT_STOPPED;
return dev->state_use_accessors == CLOCK_EVT_STATE_ONESHOT_STOPPED;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions kernel/time/tick-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ static inline int tick_device_is_functional(struct clock_event_device *dev)

static inline enum clock_event_state clockevent_get_state(struct clock_event_device *dev)
{
return dev->state;
return dev->state_use_accessors;
}

static inline void clockevent_set_state(struct clock_event_device *dev,
enum clock_event_state state)
{
dev->state = state;
dev->state_use_accessors = state;
}

extern void clockevents_shutdown(struct clock_event_device *dev);
Expand Down

0 comments on commit be3ef76

Please sign in to comment.