From patchwork Thu Aug 4 00:08:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dsaxena-linaro2 X-Patchwork-Id: 3257 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C8AC023F3F for ; Thu, 4 Aug 2011 00:08:33 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8E8B4A1856D for ; Thu, 4 Aug 2011 00:08:32 +0000 (UTC) Received: by qyk31 with SMTP id 31so119887qyk.11 for ; Wed, 03 Aug 2011 17:08:32 -0700 (PDT) Received: by 10.229.21.194 with SMTP id k2mr63279qcb.235.1312416511927; Wed, 03 Aug 2011 17:08:31 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.6.73 with SMTP id 9cs173347qcy; Wed, 3 Aug 2011 17:08:31 -0700 (PDT) Received: by 10.236.181.134 with SMTP id l6mr201085yhm.273.1312416511563; Wed, 03 Aug 2011 17:08:31 -0700 (PDT) Received: from plexity.net (plexity.net [206.123.115.38]) by mx.google.com with ESMTPS id f25si3990767yhn.55.2011.08.03.17.08.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 17:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of dsaxena@plexity.net designates 206.123.115.38 as permitted sender) client-ip=206.123.115.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dsaxena@plexity.net designates 206.123.115.38 as permitted sender) smtp.mail=dsaxena@plexity.net Received: by plexity.net (Postfix, from userid 1000) id 2DAB62144B; Wed, 3 Aug 2011 17:08:30 -0700 (PDT) Date: Wed, 3 Aug 2011 17:08:30 -0700 From: Deepak Saxena To: Thomas Gleixner , John Stultz Cc: linux-kernel@vger.kernel.org, Linus Torvalds , patches@linaro.org Subject: [PATCH] Remove CLOCK_TICK_RATE from acpi_pm clocksource driver Message-ID: <20110804000830.GD23503@plexity.net> Reply-To: dsaxena@plexity.net MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) The acpi_pm clocksource driver uses CLOCK_TICK_RATE which is defined as PIT_TICK_RATE on x86. This patch cleans it up to just use the later so that CLOCK_TICK_RATE can be depecrated. Signed-off-by: Deepak Saxena Acked-by: John Stultz --- drivers/clocksource/acpi_pm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index effe797..6b5cf02 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE, #ifndef CONFIG_X86_64 #include #define PMTMR_EXPECTED_RATE \ - ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) + ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10)) /* * Some boards have the PMTMR running way too fast. We check * the PMTMR rate against PIT channel 2 to catch these cases.