summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorDeepak Saxena <dsaxena@linaro.org>2011-08-03 17:04:01 -0700
committerTakashi Iwai <tiwai@suse.de>2011-08-04 15:23:32 +0200
commit2921623f71c0a7f8ab979a8903cccd7a374436e7 (patch)
treec5750f1e2ab7c0e47ce305c32828a1fee622e0a8 /sound/oss
parentc3540b81ee707bc8a7a83e850adf5feb3b84c04d (diff)
downloadop-kernel-dev-2921623f71c0a7f8ab979a8903cccd7a374436e7.zip
op-kernel-dev-2921623f71c0a7f8ab979a8903cccd7a374436e7.tar.gz
sound: oss/pas2: Remove CLOCK_TICK_RATE dependency from PAS16 driver
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 <dsaxena@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/pas2_pcm.c8
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;
OpenPOWER on IntegriCloud