From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepak Saxena Subject: [PATCH] Remove CLOCK_TICK_RATE from analog joystick driver Date: Wed, 3 Aug 2011 17:06:40 -0700 Message-ID: <20110804000640.GC23503@plexity.net> Reply-To: dsaxena@plexity.net Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from plexity.net ([206.123.115.38]:52533 "EHLO plexity.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755933Ab1HDANl (ORCPT ); Wed, 3 Aug 2011 20:13:41 -0400 Content-Disposition: inline Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov Cc: Thomas Gleixner , linux-input@vger.kernel.org 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 --- 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 #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