clockevents: remove ->set_mode() from struct clock_event_device

After all clockevent drivers are migrated to use the new ->set_dev_mode()
callback, get rid of the deprecated ->dev_mode() callback.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
[
Backported from viresh branch tick/oneshot-stopped.
kernel/time/clockevent.c file's patch rejected as placeholder
missing in 3.14 so ignoring them, reject patch snap for refernce

int __clockevents_update_freq(struct clock_event_device *dev, u32 freq)
 	if (dev->mode == CLOCK_EVT_MODE_ONESHOT)
 		return clockevents_program_event(dev, dev->next_event, false);

-	if (dev->mode == CLOCK_EVT_MODE_PERIODIC) {
-		/* Shouldn't fail while switching to PERIODIC MODE */
-		if (dev->set_dev_mode)
-			WARN_ON_ONCE(dev->set_dev_mode(CLOCK_EVT_MODE_PERIODIC,
-						       dev));
-		else
-			dev->set_mode(CLOCK_EVT_MODE_PERIODIC, dev);
-	}
+	/* Shouldn't fail while switching to PERIODIC MODE */
+	if (dev->mode == CLOCK_EVT_MODE_PERIODIC)
+		WARN_ON_ONCE(dev->set_dev_mode(CLOCK_EVT_MODE_PERIODIC, dev));
]
Signed-off-by: Santosh Shukla <santosh.shukla@linaro.org>

3 files changed, 4 insertions, 14 deletions

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index cfe713778b87..380c8a28366f 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -77,7 +77,6 @@ enum clock_event_mode {
  * @features:		features
  * @retries:		number of forced programming retries
  * @set_dev_mode:	set dev mode function
- * @set_mode:		set mode function (deprecated, use set_dev_mode instead)
  * @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
@@ -106,8 +105,6 @@ struct clock_event_device {
 	void			(*broadcast)(const struct cpumask *mask);
 	int			(*set_dev_mode)(enum clock_event_mode mode,
 					    struct clock_event_device *);
-	void			(*set_mode)(enum clock_event_mode mode,
-					    struct clock_event_device *);
 	void			(*suspend)(struct clock_event_device *);
 	void			(*resume)(struct clock_event_device *);
 	unsigned long		min_delta_ticks;
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 46b5454d388e..c1f00d41e4ee 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -105,14 +105,10 @@ void clockevents_set_mode(struct clock_event_device *dev,
 				 enum clock_event_mode mode)
 {
 	if (dev->mode != mode) {
-		if (dev->set_dev_mode) {
-			int ret = dev->set_dev_mode(mode, dev);
+		int ret = dev->set_dev_mode(mode, dev);
 
-			/* Currently available modes shouldn't fail */
-			WARN_ONCE(ret, "Requested mode: %d, error: %d\n", mode, ret);
-		} else {
-			dev->set_mode(mode, dev);
-		}
+		/* Currently available modes shouldn't fail */
+		WARN_ONCE(ret, "Requested mode: %d, error: %d\n", mode, ret);
 
 		dev->mode = mode;
 
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 957a04951ef0..8e43c9f6d88c 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -229,10 +229,7 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
 	SEQ_printf(m, "\n");
 
 	SEQ_printf(m, " set_mode:       ");
-	if (dev->set_dev_mode)
-		print_name_offset(m, dev->set_dev_mode);
-	else
-		print_name_offset(m, dev->set_mode);
+	print_name_offset(m, dev->set_dev_mode);
 	SEQ_printf(m, "\n");
 
 	SEQ_printf(m, " event_handler:  ");