projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sound: add moduleparam.h to users of module_param/MODULE_PARM_DESC
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
sn95031.c
diff --git
a/sound/soc/codecs/sn95031.c
b/sound/soc/codecs/sn95031.c
index 84ffdebb8a8b9c937c9ffa1323f4de40f2874e81..f681e41fc12efa291b61ed9308eb853d85a6c14f 100644
(file)
--- a/
sound/soc/codecs/sn95031.c
+++ b/
sound/soc/codecs/sn95031.c
@@
-79,7
+79,7
@@
static void configure_adc(struct snd_soc_codec *sn95031_codec, int val)
*/
static int find_free_channel(struct snd_soc_codec *sn95031_codec)
{
*/
static int find_free_channel(struct snd_soc_codec *sn95031_codec)
{
- int
ret = 0,
i, value;
+ int i, value;
/* check whether ADC is enabled */
value = snd_soc_read(sn95031_codec, SN95031_ADC1CNTL1);
/* check whether ADC is enabled */
value = snd_soc_read(sn95031_codec, SN95031_ADC1CNTL1);
@@
-91,12
+91,10
@@
static int find_free_channel(struct snd_soc_codec *sn95031_codec)
for (i = 0; i < SN95031_ADC_CHANLS_MAX; i++) {
value = snd_soc_read(sn95031_codec,
SN95031_ADC_CHNL_START_ADDR + i);
for (i = 0; i < SN95031_ADC_CHANLS_MAX; i++) {
value = snd_soc_read(sn95031_codec,
SN95031_ADC_CHNL_START_ADDR + i);
- if (value & SN95031_STOPBIT_MASK) {
- ret = i;
+ if (value & SN95031_STOPBIT_MASK)
break;
break;
- }
}
}
- return (
ret > SN95031_ADC_LOOP_MAX) ? (-EINVAL) : ret
;
+ return (
i == SN95031_ADC_CHANLS_MAX) ? (-EINVAL) : i
;
}
/* Initialize the ADC for reading micbias values. Can sleep. */
}
/* Initialize the ADC for reading micbias values. Can sleep. */
@@
-104,7
+102,7
@@
static int sn95031_initialize_adc(struct snd_soc_codec *sn95031_codec)
{
int base_addr, chnl_addr;
int value;
{
int base_addr, chnl_addr;
int value;
-
static
int channel_index;
+ int channel_index;
/* Index of the first channel in which the stop bit is set */
channel_index = find_free_channel(sn95031_codec);
/* Index of the first channel in which the stop bit is set */
channel_index = find_free_channel(sn95031_codec);
@@
-163,7
+161,6
@@
static unsigned int sn95031_get_mic_bias(struct snd_soc_codec *codec)
pr_debug("mic bias = %dmV\n", mic_bias);
return mic_bias;
}
pr_debug("mic bias = %dmV\n", mic_bias);
return mic_bias;
}
-EXPORT_SYMBOL_GPL(sn95031_get_mic_bias);
/*end - adc helper functions */
static inline unsigned int sn95031_read(struct snd_soc_codec *codec,
/*end - adc helper functions */
static inline unsigned int sn95031_read(struct snd_soc_codec *codec,
@@
-660,7
+657,7
@@
static int sn95031_pcm_spkr_mute(struct snd_soc_dai *dai, int mute)
return 0;
}
return 0;
}
-int sn95031_pcm_hw_params(struct snd_pcm_substream *substream,
+
static
int sn95031_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{
unsigned int format, rate;
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{
unsigned int format, rate;
@@
-718,7
+715,7
@@
static struct snd_soc_dai_ops sn95031_vib2_dai_ops = {
.hw_params = sn95031_pcm_hw_params,
};
.hw_params = sn95031_pcm_hw_params,
};
-struct snd_soc_dai_driver sn95031_dais[] = {
+st
atic st
ruct snd_soc_dai_driver sn95031_dais[] = {
{
.name = "SN95031 Headset",
.playback = {
{
.name = "SN95031 Headset",
.playback = {
@@
-829,7
+826,6
@@
static int sn95031_codec_probe(struct snd_soc_codec *codec)
{
pr_debug("codec_probe called\n");
{
pr_debug("codec_probe called\n");
- codec->dapm.bias_level = SND_SOC_BIAS_OFF;
codec->dapm.idle_bias_off = 1;
/* PCM interface config
codec->dapm.idle_bias_off = 1;
/* PCM interface config
This page took
0.031723 seconds
and
5
git commands to generate.