aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8750.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/wm8750.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/wm8750.c')
-rw-r--r--sound/soc/codecs/wm8750.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 34d846587759..9847aa064d6b 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -934,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev)
934 struct wm8750_setup_data *setup = socdev->codec_data; 934 struct wm8750_setup_data *setup = socdev->codec_data;
935 struct snd_soc_codec *codec; 935 struct snd_soc_codec *codec;
936 struct wm8750_priv *wm8750; 936 struct wm8750_priv *wm8750;
937 int ret = 0; 937 int ret;
938 938
939 pr_info("WM8750 Audio Codec %s", WM8750_VERSION); 939 pr_info("WM8750 Audio Codec %s", WM8750_VERSION);
940 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); 940 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
@@ -955,13 +955,13 @@ static int wm8750_probe(struct platform_device *pdev)
955 wm8750_socdev = socdev; 955 wm8750_socdev = socdev;
956 INIT_DELAYED_WORK(&codec->delayed_work, wm8750_work); 956 INIT_DELAYED_WORK(&codec->delayed_work, wm8750_work);
957 957
958 ret = -ENODEV;
959
958#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 960#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
959 if (setup->i2c_address) { 961 if (setup->i2c_address) {
960 codec->hw_write = (hw_write_t)i2c_master_send; 962 codec->hw_write = (hw_write_t)i2c_master_send;
961 ret = wm8750_add_i2c_device(pdev, setup); 963 ret = wm8750_add_i2c_device(pdev, setup);
962 } 964 }
963#else
964 /* Add other interfaces here */
965#endif 965#endif
966 966
967 if (ret != 0) { 967 if (ret != 0) {