1 files changed, 5 insertions, 24 deletions

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 31ce435981fe..bdcf358dfce2 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -18,15 +18,6 @@
 struct clock_event_device;
 struct module;
 
-/* Clock event mode commands for legacy ->set_mode(): OBSOLETE */
-enum clock_event_mode {
-        CLOCK_EVT_MODE_UNUSED,
-        CLOCK_EVT_MODE_SHUTDOWN,
-        CLOCK_EVT_MODE_PERIODIC,
-        CLOCK_EVT_MODE_ONESHOT,
-        CLOCK_EVT_MODE_RESUME,
-};
-
 /*
  * Possible states of a clock event device.
  *
@@ -86,16 +77,14 @@ enum clock_event_state {
  * @min_delta_ns:       minimum delta value in ns
  * @mult:               nanosecond to cycles multiplier
  * @shift:              nanoseconds to cycles divisor (power of two)
- * @mode:               operating mode, relevant only to ->set_mode(), OBSOLETE
  * @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.
- * @set_state_periodic: switch state to periodic, if !set_mode
- * @set_state_oneshot:  switch state to oneshot, if !set_mode
- * @set_state_oneshot_stopped: switch state to oneshot_stopped, if !set_mode
- * @set_state_shutdown: switch state to shutdown, if !set_mode
- * @tick_resume:        resume clkevt device, if !set_mode
+ * @set_state_periodic: switch state to periodic
+ * @set_state_oneshot:  switch state to oneshot
+ * @set_state_oneshot_stopped: switch state to oneshot_stopped
+ * @set_state_shutdown: switch state to shutdown
+ * @tick_resume:        resume clkevt device
  * @broadcast:          function to broadcast events
  * @min_delta_ticks:    minimum delta value in ticks stored for reconfiguration
  * @max_delta_ticks:    maximum delta value in ticks stored for reconfiguration
@@ -116,18 +105,10 @@ struct clock_event_device {
         u64                     min_delta_ns;
         u32                     mult;
         u32                     shift;
-        enum clock_event_mode   mode;
         enum clock_event_state  state_use_accessors;
         unsigned int            features;
         unsigned long           retries;
 
-        /*
-         * State transition callback(s): Only one of the two groups should be
-         * defined:
-         * - set_mode(), only for modes <= CLOCK_EVT_MODE_RESUME.
-         * - set_state_{shutdown|periodic|oneshot|oneshot_stopped}(), tick_resume().
-         */
-        void                    (*set_mode)(enum clock_event_mode mode, struct clock_event_device *);
         int                     (*set_state_periodic)(struct clock_event_device *);
         int                     (*set_state_oneshot)(struct clock_event_device *);
         int                     (*set_state_oneshot_stopped)(struct clock_event_device *);