Commit c9cb2e3d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] hrtimers: namespace and enum cleanup 



- hrtimers did not use the hrtimer_restart enum and relied on the implict
  int representation. Fix the prototypes and the functions using the enums.
- Use seperate name spaces for the enumerations
- Convert hrtimer_restart macro to inline function
- Add comments

No functional changes.

[akpm@osdl.org: fix input driver]
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fd064b9b

drivers/input/touchscreen/ads7846.c

+6 −5
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static void ads7846_rx(void *ads) 
			ts->spi->dev.bus_id, ts->tc.ignore, Rt);

#endif

		hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),

			      HRTIMER_REL);

			      HRTIMER_MODE_REL);

		return;

	}
@@ -578,7 +578,8 @@ static void ads7846_rx(void *ads) 
#endif

	}



	hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD), HRTIMER_REL);

	hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),

			HRTIMER_MODE_REL);

}



static int ads7846_debounce(void *ads, int data_idx, int *val)
@@ -667,7 +668,7 @@ static void ads7846_rx_val(void *ads) 
				status);

}



static int ads7846_timer(struct hrtimer *handle)

static enum hrtimer_restart ads7846_timer(struct hrtimer *handle)

{

	struct ads7846	*ts = container_of(handle, struct ads7846, timer);

	int		status = 0;
@@ -724,7 +725,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle) 
			disable_irq(ts->spi->irq);

			ts->pending = 1;

			hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY),

					HRTIMER_REL);

					HRTIMER_MODE_REL);

		}

	}

	spin_unlock_irqrestore(&ts->lock, flags);
@@ -862,7 +863,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) 
	ts->spi = spi;

	ts->input = input_dev;



	hrtimer_init(&ts->timer, CLOCK_MONOTONIC, HRTIMER_REL);

	hrtimer_init(&ts->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	ts->timer.function = ads7846_timer;



	spin_lock_init(&ts->lock);

include/linux/hrtimer.h

+12 −8
Original line number Diff line number Diff line
@@ -25,17 +25,18 @@ 
 * Mode arguments of xxx_hrtimer functions:

 */

enum hrtimer_mode {

	HRTIMER_ABS,	/* Time value is absolute */

	HRTIMER_REL,	/* Time value is relative to now */

	HRTIMER_MODE_ABS,	/* Time value is absolute */

	HRTIMER_MODE_REL,	/* Time value is relative to now */

};



/*

 * Return values for the callback function

 */

enum hrtimer_restart {

	HRTIMER_NORESTART,

	HRTIMER_RESTART,

	HRTIMER_NORESTART,	/* Timer is not restarted */

	HRTIMER_RESTART,	/* Timer must be restarted */

};



#define HRTIMER_INACTIVE	((void *)1UL)



struct hrtimer_base;



/**
@@ -52,7 +53,7 @@ struct hrtimer_base; 
struct hrtimer {

	struct rb_node		node;

	ktime_t			expires;

	int			(*function)(struct hrtimer *);

	enum hrtimer_restart	(*function)(struct hrtimer *);

	struct hrtimer_base	*base;

};
@@ -114,7 +115,10 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim, 
extern int hrtimer_cancel(struct hrtimer *timer);

extern int hrtimer_try_to_cancel(struct hrtimer *timer);



#define hrtimer_restart(timer) hrtimer_start((timer), (timer)->expires, HRTIMER_ABS)

static inline int hrtimer_restart(struct hrtimer *timer)

{

	return hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS);

}



/* Query timers: */

extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer);

include/linux/timer.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static inline void add_timer(struct timer_list *timer) 
extern void init_timers(void);

extern void run_local_timers(void);

struct hrtimer;

extern int it_real_fn(struct hrtimer *);

extern enum hrtimer_restart it_real_fn(struct hrtimer *);



unsigned long __round_jiffies(unsigned long j, int cpu);

unsigned long __round_jiffies_relative(unsigned long j, int cpu);

kernel/fork.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts 
	init_sigpending(&sig->shared_pending);

	INIT_LIST_HEAD(&sig->posix_timers);



	hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_REL);

	hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	sig->it_real_incr.tv64 = 0;

	sig->real_timer.function = it_real_fn;

	sig->tsk = tsk;

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ static int futex_lock_pi(u32 __user *uaddr, int detect, unsigned long sec, 


	if (sec != MAX_SCHEDULE_TIMEOUT) {

		to = &timeout;

		hrtimer_init(&to->timer, CLOCK_REALTIME, HRTIMER_ABS);

		hrtimer_init(&to->timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);

		hrtimer_init_sleeper(to, current);

		to->timer.expires = ktime_set(sec, nsec);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE