diff mbox

Remove CLOCK_TICK_RATE from analog joystick driver

Message ID 20110804000640.GC23503@plexity.net (mailing list archive)
State New, archived
Headers show

Commit Message

Deepak Saxena Aug. 4, 2011, 12:06 a.m. UTC
The analog joystick driver is written for x86 systems. This
patch updates it to use the the PIT_TICK_RATE value instead
of CLOCK_TICK_RATE as they are equivalent on x86 and we 
want to depecrate the later.

Signed-off-by: Deepak Saxena <dsaxena@linaro.org>
---
 drivers/input/joystick/analog.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Dmitry Torokhov Aug. 5, 2011, 6:40 a.m. UTC | #1
On Wed, Aug 03, 2011 at 05:06:40PM -0700, Deepak Saxena wrote:
> The analog joystick driver is written for x86 systems. This
> patch updates it to use the the PIT_TICK_RATE value instead
> of CLOCK_TICK_RATE as they are equivalent on x86 and we 
> want to depecrate the later.
> 
> Signed-off-by: Deepak Saxena <dsaxena@linaro.org>

Applied, thank you Deepak.

> ---
>  drivers/input/joystick/analog.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
> index 9882971..358cd7e 100644
> --- a/drivers/input/joystick/analog.c
> +++ b/drivers/input/joystick/analog.c
> @@ -139,7 +139,7 @@ struct analog_port {
>  #include <linux/i8253.h>
>  
>  #define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
> -#define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
> +#define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
>  #define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
>  static unsigned int get_time_pit(void)
>  {
> -- 
> 1.7.4.1
>
diff mbox

Patch

diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 9882971..358cd7e 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -139,7 +139,7 @@  struct analog_port {
 #include <linux/i8253.h>
 
 #define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
-#define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
+#define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
 #define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
 static unsigned int get_time_pit(void)
 {