aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-06-12 17:34:23 -0400
committerMark Brown <broonie@linaro.org>2013-06-13 05:26:57 -0400
commit9be94aeabf551aa5e2481ab9d626ba82d6b14f3d (patch)
tree6280067bf4768b9262ebf70d17d22a14a4674769
parent040a62cf1c040362fb11587fb9f02e1881f4c237 (diff)
ASoC: rt5640: fix sparse warnings
This fixes: 975:9: sparse: Using plain integer as NULL pointer 1917:24: sparse: symbol 'rt5640_aif_dai_ops' was not declared. Should it be static? 1924:27: sparse: symbol 'rt5640_dai' was not declared. Should it be static? 2079:19: sparse: symbol 'rt5640_i2c_driver' was not declared. Should it be static? Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/codecs/rt5640.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 8761552882a5..ce585e37e38a 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -974,7 +974,7 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
974 SND_SOC_DAPM_SUPPLY("LDO2", RT5640_PWR_ANLG1, 974 SND_SOC_DAPM_SUPPLY("LDO2", RT5640_PWR_ANLG1,
975 RT5640_PWR_LDO2_BIT, 0, NULL, 0), 975 RT5640_PWR_LDO2_BIT, 0, NULL, 0),
976 SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5640_PWR_ANLG2, 976 SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5640_PWR_ANLG2,
977 RT5640_PWR_MB1_BIT, 0, 0, 0), 977 RT5640_PWR_MB1_BIT, 0, NULL, 0),
978 /* Input Lines */ 978 /* Input Lines */
979 SND_SOC_DAPM_INPUT("DMIC1"), 979 SND_SOC_DAPM_INPUT("DMIC1"),
980 SND_SOC_DAPM_INPUT("DMIC2"), 980 SND_SOC_DAPM_INPUT("DMIC2"),
@@ -1915,14 +1915,14 @@ static int rt5640_resume(struct snd_soc_codec *codec)
1915#define RT5640_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ 1915#define RT5640_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
1916 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8) 1916 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
1917 1917
1918struct snd_soc_dai_ops rt5640_aif_dai_ops = { 1918static const struct snd_soc_dai_ops rt5640_aif_dai_ops = {
1919 .hw_params = rt5640_hw_params, 1919 .hw_params = rt5640_hw_params,
1920 .set_fmt = rt5640_set_dai_fmt, 1920 .set_fmt = rt5640_set_dai_fmt,
1921 .set_sysclk = rt5640_set_dai_sysclk, 1921 .set_sysclk = rt5640_set_dai_sysclk,
1922 .set_pll = rt5640_set_dai_pll, 1922 .set_pll = rt5640_set_dai_pll,
1923}; 1923};
1924 1924
1925struct snd_soc_dai_driver rt5640_dai[] = { 1925static struct snd_soc_dai_driver rt5640_dai[] = {
1926 { 1926 {
1927 .name = "rt5640-aif1", 1927 .name = "rt5640-aif1",
1928 .id = RT5640_AIF1, 1928 .id = RT5640_AIF1,
@@ -2112,7 +2112,7 @@ static int rt5640_i2c_remove(struct i2c_client *i2c)
2112 return 0; 2112 return 0;
2113} 2113}
2114 2114
2115struct i2c_driver rt5640_i2c_driver = { 2115static struct i2c_driver rt5640_i2c_driver = {
2116 .driver = { 2116 .driver = {
2117 .name = "rt5640", 2117 .name = "rt5640",
2118 .owner = THIS_MODULE, 2118 .owner = THIS_MODULE,