From patchwork Thu Aug 4 00:04:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dsaxena-linaro2 X-Patchwork-Id: 3256 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 6A56824070 for ; Thu, 4 Aug 2011 00:04:03 +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 3281AA1833B for ; Thu, 4 Aug 2011 00:04:03 +0000 (UTC) Received: by qyk31 with SMTP id 31so118091qyk.11 for ; Wed, 03 Aug 2011 17:04:02 -0700 (PDT) Received: by 10.229.68.97 with SMTP id u33mr71304qci.159.1312416242603; Wed, 03 Aug 2011 17:04:02 -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 9cs173290qcy; Wed, 3 Aug 2011 17:04:02 -0700 (PDT) Received: by 10.236.146.73 with SMTP id q49mr234438yhj.0.1312416242139; Wed, 03 Aug 2011 17:04:02 -0700 (PDT) Received: from plexity.net (plexity.net [206.123.115.38]) by mx.google.com with ESMTPS id i26si3944780yhm.137.2011.08.03.17.04.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 17:04:02 -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 B62F52144A; Wed, 3 Aug 2011 17:04:01 -0700 (PDT) Date: Wed, 3 Aug 2011 17:04:01 -0700 From: Deepak Saxena To: Jaroslav Kysela , Takashi Iwai Cc: linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH] Remove CLOCK_TICK_RATE dependency from PAS16 driver Message-ID: <20110804000401.GB23503@plexity.net> Reply-To: dsaxena@plexity.net MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Update the PAS16 driver to use PIT_TICK_RATE instead of the more generic CLOCK_TICK_RATE as the two are equivalent on X86 and we want to depecrate the later. Signed-off-by: Deepak Saxena --- sound/oss/pas2_pcm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c index 8f7d175..6f13ab4 100644 --- a/sound/oss/pas2_pcm.c +++ b/sound/oss/pas2_pcm.c @@ -63,13 +63,13 @@ static int pcm_set_speed(int arg) if (pcm_channels & 2) { - foo = ((CLOCK_TICK_RATE / 2) + (arg / 2)) / arg; - arg = ((CLOCK_TICK_RATE / 2) + (foo / 2)) / foo; + foo = ((PIT_TICK_RATE / 2) + (arg / 2)) / arg; + arg = ((PIT_TICK_RATE / 2) + (foo / 2)) / foo; } else { - foo = (CLOCK_TICK_RATE + (arg / 2)) / arg; - arg = (CLOCK_TICK_RATE + (foo / 2)) / foo; + foo = (PIT_TICK_RATE + (arg / 2)) / arg; + arg = (PIT_TICK_RATE + (foo / 2)) / foo; } pcm_speed = arg;