Skip to contentSkip to conversation

Remove CLOCK_TICK_RATE dependency from PAS16 driver

PATCH Applied Deepak Saxena 2 participants 2 messages Aug 4, 2011 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 sound/oss/pas2_pcm.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
sound/oss/pas2_pcm.c +4 -4
index 8f7d175..6f13ab4 100644
@@ -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;
Signature · 1 line
1.7.4.1
Applied
#1 lore raw

At Wed, 3 Aug 2011 17:04:01 -0700,

Quoted 6 lines · Deepak Saxena

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.

Thanks, applied.

Takashi

Quoted 29 lines
---
 sound/oss/pas2_pcm.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
sound/oss/pas2_pcm.c +4 -4
index 8f7d175..6f13ab4 100644
@@ -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;
Signature · 1 line
1.7.4.1