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>

diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index e512cd79d767ee2ad902d0e0334cbe4c719e36f3..088cf99277203ff4d729d722629ed8cf222f2cb0 100644 (file)
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -622,7 +622,7 @@ static int ak4535_probe(struct platform_device *pdev)
        struct ak4535_setup_data *setup;
        struct snd_soc_codec *codec;
        struct ak4535_priv *ak4535;
-       int ret = 0;
+       int ret;
 
        printk(KERN_INFO "AK4535 Audio Codec %s", AK4535_VERSION);
 
@@ -644,14 +644,14 @@ static int ak4535_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&codec->dapm_paths);
 
        ak4535_socdev = socdev;
+       ret = -ENODEV;
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        if (setup->i2c_address) {
                codec->hw_write = (hw_write_t)i2c_master_send;
                codec->hw_read = (hw_read_t)i2c_master_recv;
                ret = ak4535_add_i2c_device(pdev, setup);
        }
-#else
-       /* Add other interfaces here */
 #endif
 
        if (ret != 0) {

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index f0c80436b97511c2a4ec965ce702899f50b1d028..d206d7f892b68b8c0103bc5337b27e5b460b62d2 100644 (file)
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -788,7 +788,7 @@ static int uda1380_probe(struct platform_device *pdev)
        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
        struct uda1380_setup_data *setup;
        struct snd_soc_codec *codec;
-       int ret = 0;
+       int ret;
 
        pr_info("UDA1380 Audio Codec %s", UDA1380_VERSION);
 
@@ -803,13 +803,13 @@ static int uda1380_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&codec->dapm_paths);
 
        uda1380_socdev = socdev;
+       ret = -ENODEV;
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        if (setup->i2c_address) {
                codec->hw_write = (hw_write_t)i2c_master_send;
                ret = uda1380_add_i2c_device(pdev, setup);
        }
-#else
-       /* Add other interfaces here */
 #endif
 
        if (ret != 0)

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 34d84658775955f316d520f8c748c3619d2a1c0e..9847aa064d6b1c1d414ecacaf9ab4e6dbd9de0fd 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -934,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev)
        struct wm8750_setup_data *setup = socdev->codec_data;
        struct snd_soc_codec *codec;
        struct wm8750_priv *wm8750;
-       int ret = 0;
+       int ret;
 
        pr_info("WM8750 Audio Codec %s", WM8750_VERSION);
        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
@@ -955,13 +955,13 @@ static int wm8750_probe(struct platform_device *pdev)
        wm8750_socdev = socdev;
        INIT_DELAYED_WORK(&codec->delayed_work, wm8750_work);
 
+       ret = -ENODEV;
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        if (setup->i2c_address) {
                codec->hw_write = (hw_write_t)i2c_master_send;
                ret = wm8750_add_i2c_device(pdev, setup);
        }
-#else
-               /* Add other interfaces here */
 #endif
 
        if (ret != 0) {

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index e1bb5059755abe58371598eaa1674fd0829c2a2d..63410d7b5efb3623c8e92585ac51fb9ff8737606 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1565,7 +1565,7 @@ static int wm8990_probe(struct platform_device *pdev)
        struct wm8990_setup_data *setup;
        struct snd_soc_codec *codec;
        struct wm8990_priv *wm8990;
-       int ret = 0;
+       int ret;
 
        pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION);
 
@@ -1587,13 +1587,13 @@ static int wm8990_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&codec->dapm_paths);
        wm8990_socdev = socdev;
 
+       ret = -ENODEV;
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        if (setup->i2c_address) {
                codec->hw_write = (hw_write_t)i2c_master_send;
                ret = wm8990_add_i2c_device(pdev, setup);
        }
-#else
-               /* Add other interfaces here */
 #endif
 
        if (ret != 0) {