From patchwork Thu Aug 4 00:06:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Saxena X-Patchwork-Id: 1033642 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p740DgAl012765 for ; Thu, 4 Aug 2011 00:13:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755956Ab1HDANl (ORCPT ); Wed, 3 Aug 2011 20:13:41 -0400 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 04 Aug 2011 00:13:43 +0000 (UTC) X-Greylist: delayed 420 seconds by postgrey-1.27 at vger.kernel.org; Wed, 03 Aug 2011 20:13:41 EDT Received: by plexity.net (Postfix, from userid 1000) id D346720B13; Wed, 3 Aug 2011 17:06:40 -0700 (PDT) Date: Wed, 3 Aug 2011 17:06:40 -0700 From: Deepak Saxena To: Dmitry Torokhov Cc: Thomas Gleixner , linux-input@vger.kernel.org Subject: [PATCH] Remove CLOCK_TICK_RATE from analog joystick driver Message-ID: <20110804000640.GC23503@plexity.net> Reply-To: dsaxena@plexity.net MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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) {