summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/nau8821.c6
-rw-r--r--sound/soc/codecs/rt5682s.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/codecs/nau8821.c b/sound/soc/codecs/nau8821.c
index 4ea56d2f9509..2de818377484 100644
--- a/sound/soc/codecs/nau8821.c
+++ b/sound/soc/codecs/nau8821.c
@@ -381,7 +381,7 @@ static int dmic_clock_control(struct snd_soc_dapm_widget *w,
speed_selection = dmic_speed_sel[i].val;
break;
}
- if (speed_selection < 0)
+ if (i == 4)
return -EINVAL;
dev_dbg(nau8821->dev,
@@ -1178,7 +1178,9 @@ static void nau8821_fll_apply(struct nau8821 *nau8821,
/**
* nau8821_set_fll - FLL configuration of nau8821
- * @codec: codec component
+ * @component: codec component
+ * @pll_id: PLL requested
+ * @source: clock source
* @freq_in: frequency of input clock source
* @freq_out: must be 256*Fs in order to achieve the best performance
*
diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c
index f6435b233a51..470957fcad6b 100644
--- a/sound/soc/codecs/rt5682s.c
+++ b/sound/soc/codecs/rt5682s.c
@@ -41,7 +41,7 @@ static const struct rt5682s_platform_data i2s_default_platform_data = {
.dai_clk_names[RT5682S_DAI_BCLK_IDX] = "rt5682-dai-bclk",
};
-const char *rt5682s_supply_names[RT5682S_NUM_SUPPLIES] = {
+static const char *rt5682s_supply_names[RT5682S_NUM_SUPPLIES] = {
"AVDD",
"MICVDD",
};
@@ -71,7 +71,7 @@ static void rt5682s_apply_patch_list(struct rt5682s_priv *rt5682s,
dev_warn(dev, "Failed to apply regmap patch: %d\n", ret);
}
-const struct reg_default rt5682s_reg[] = {
+static const struct reg_default rt5682s_reg[] = {
{0x0002, 0x8080},
{0x0003, 0x0001},
{0x0005, 0x0000},
@@ -2838,7 +2838,7 @@ static int rt5682s_resume(struct snd_soc_component *component)
#define rt5682s_resume NULL
#endif
-const struct snd_soc_dai_ops rt5682s_aif1_dai_ops = {
+static const struct snd_soc_dai_ops rt5682s_aif1_dai_ops = {
.hw_params = rt5682s_hw_params,
.set_fmt = rt5682s_set_dai_fmt,
.set_tdm_slot = rt5682s_set_tdm_slot,