summaryrefslogtreecommitdiff
path: root/sound/pci/lola
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-03 18:39:37 +0400
committerTakashi Iwai <tiwai@suse.de>2011-05-03 18:40:52 +0400
commit1c5d7b312f9d0e18e2051eac058257db3586f54d (patch)
tree4c805b4c32c1bb5e7e4f49ae34b66b4fbad552c9 /sound/pci/lola
parentd43f3010b8fa7530c3780c087fad9b0a8a437ba1 (diff)
downloadlinux-1c5d7b312f9d0e18e2051eac058257db3586f54d.tar.xz
ALSA: lola - Make SRC helper global
Make lola_sample_rate_convert() global so that it can be accessed from other files. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/lola')
-rw-r--r--sound/pci/lola/lola.h1
-rw-r--r--sound/pci/lola/lola_clock.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/lola/lola.h b/sound/pci/lola/lola.h
index 4734c7c6f83e..23831a1a95ad 100644
--- a/sound/pci/lola/lola.h
+++ b/sound/pci/lola/lola.h
@@ -499,6 +499,7 @@ int lola_set_clock_index(struct lola *chip, unsigned int idx);
int lola_set_clock(struct lola *chip, int idx);
int lola_set_sample_rate(struct lola *chip, int rate);
bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val);
+unsigned int lola_sample_rate_convert(unsigned int coded);
/* mixer */
int lola_init_pins(struct lola *chip, int dir, int *nidp);
diff --git a/sound/pci/lola/lola_clock.c b/sound/pci/lola/lola_clock.c
index a364dc67e55f..d2cce39c3474 100644
--- a/sound/pci/lola/lola_clock.c
+++ b/sound/pci/lola/lola_clock.c
@@ -24,7 +24,7 @@
#include <sound/pcm.h>
#include "lola.h"
-static unsigned int sample_rate_convert(unsigned int coded)
+unsigned int lola_sample_rate_convert(unsigned int coded)
{
unsigned int freq;
@@ -172,7 +172,7 @@ int __devinit lola_init_clock_widget(struct lola *chip, int nid)
int format = LOLA_CLOCK_FORMAT_NONE;
bool add_clock = true;
if (type == LOLA_CLOCK_TYPE_INTERNAL) {
- freq = sample_rate_convert(freq);
+ freq = lola_sample_rate_convert(freq);
if (freq < chip->sample_rate_min)
add_clock = false;
else if (freq == 48000) {
@@ -181,7 +181,7 @@ int __devinit lola_init_clock_widget(struct lola *chip, int nid)
chip->clock.cur_valid = true;
}
} else if (type == LOLA_CLOCK_TYPE_VIDEO) {
- freq = sample_rate_convert(freq);
+ freq = lola_sample_rate_convert(freq);
if (freq < chip->sample_rate_min)
add_clock = false;
/* video clock has a format (0:NTSC, 1:PAL)*/
@@ -263,7 +263,7 @@ bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val)
/* only for current = external clocks */
if (chip->clock.sample_clock[chip->clock.cur_index].type !=
LOLA_CLOCK_TYPE_INTERNAL) {
- chip->clock.cur_freq = sample_rate_convert(val & 0x7f);
+ chip->clock.cur_freq = lola_sample_rate_convert(val & 0x7f);
chip->clock.cur_valid = (val & 0x100) != 0;
}
return true;