aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8990.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-09-01 13:47:04 -0400
committerJaroslav Kysela <perex@perex.cz>2008-09-04 04:34:30 -0400
commitb7c9d8520564eca89da8733e5248c7ce8ee8e1b0 (patch)
tree2788d304f3e00e91cbaec157291270105af7e52a /sound/soc/codecs/wm8990.c
parentd2a403553ba7659d85dae2a05b1f3767d2fefcfe (diff)
ALSA: ASoC: Don't suggest compile time selection of codec access
Currently the boiler plate code used by most ASoC codecs to provide a placeholder for SPI access suggests making the selection of SPI a compile time option which is suboptimal when trying to build kernels supporting multiple systems. Change this template to suggest allowing runtime selection instead. Leave the drivers not yet converted to new style I2C access for now to avoid collisions. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r--sound/soc/codecs/wm8990.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index e1bb5059755a..63410d7b5efb 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1565,7 +1565,7 @@ static int wm8990_probe(struct platform_device *pdev)
1565 struct wm8990_setup_data *setup; 1565 struct wm8990_setup_data *setup;
1566 struct snd_soc_codec *codec; 1566 struct snd_soc_codec *codec;
1567 struct wm8990_priv *wm8990; 1567 struct wm8990_priv *wm8990;
1568 int ret = 0; 1568 int ret;
1569 1569
1570 pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION); 1570 pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION);
1571 1571
@@ -1587,13 +1587,13 @@ static int wm8990_probe(struct platform_device *pdev)
1587 INIT_LIST_HEAD(&codec->dapm_paths); 1587 INIT_LIST_HEAD(&codec->dapm_paths);
1588 wm8990_socdev = socdev; 1588 wm8990_socdev = socdev;
1589 1589
1590 ret = -ENODEV;
1591
1590#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 1592#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1591 if (setup->i2c_address) { 1593 if (setup->i2c_address) {
1592 codec->hw_write = (hw_write_t)i2c_master_send; 1594 codec->hw_write = (hw_write_t)i2c_master_send;
1593 ret = wm8990_add_i2c_device(pdev, setup); 1595 ret = wm8990_add_i2c_device(pdev, setup);
1594 } 1596 }
1595#else
1596 /* Add other interfaces here */
1597#endif 1597#endif
1598 1598
1599 if (ret != 0) { 1599 if (ret != 0) {