ASoC: soc-core: Increment codec and platform driver refcounts before probing
Subsystems (7)
PATCH 1/4 ASoC: soc-core: Increment codec and platform driver refcounts before probing
Commit f6c2ed5 "ASoC: Fix the device references to codec and platform drivers" moved codec and platform driver refcount increments from soc_bind_dai_link to more appropriate places.
Adjust a little them so that refcounts are incremented before executing the driver probe functions.
---
I don't know any regression with this so probably 2.6.39 material.
--- sound/soc/soc-core.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
sound/soc/soc-core.c +13 -8
@@ -1408,26 +1408,31 @@ static int soc_probe_codec(struct snd_soc_card *card, codec->dapm.card = card;soc_set_name_prefix (card, codec); +if (!try_module_get (codec->dev->driver->owner)) +return -ENODEV ; +if (codec->driver->probe) { ret = codec->driver->probe (codec);if (ret <0 ) {dev_err (codec->dev,"asoc: failed to probe CODEC %s: %d\n" , codec->name, ret); -return ret; + goto err_probe; } }soc_init_codec_debugfs (codec);/* mark codec as probed and add to card codec list */ -if (!try_module_get (codec->dev->driver->owner)) -return -ENODEV ; - codec->probed =1 ;list_add (&codec->card_list, &card->codec_dev_list);list_add (&codec->dapm.list, &card->dapm_list); +return 0 ; + +err_probe: +module_put (codec->dev->driver->owner); +return ret; }
@@ -1545,19 +1550,19 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)/* probe the platform */ if (!platform->probed) { +if (!try_module_get (platform->dev->driver->owner)) +return -ENODEV ; +if (platform->driver->probe) { ret = platform->driver->probe (platform);if (ret <0 ) {printk (KERN_ERR "asoc: failed to probe platform %s\n" , platform->name); +module_put (platform->dev->driver->owner);return ret; } }/* mark platform as probed and add to card platform list */ - -if (!try_module_get (platform->dev->driver->owner)) -return -ENODEV ; - platform->probed =1 ;list_add (&platform->card_list, &card->platform_dev_list); }
Signature · 1 line
1.7.2.3
PATCH 2/4 ASoC: Add optional pointer to machine audio routes to snd_soc_card
This is targeted mostly to cross-device setups where single audio map defining routes around and between the codecs looks cleaner than defining and registering maps to each codec separately from machine init callbacks.
This could be also used to reduce simple machine init callbacks where only snd_soc_dapm_add_routes and snd_soc_dapm_sync are called. However, this does work only if the widgets names are unique in the system.
Idea of common audio map came from Peter Ujfalusi <[email protected]>.
--- include/sound/soc.h | 8 ++++++++ sound/soc/soc-core.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-)
include/sound/soc.h +8 -0
@@ -686,6 +686,14 @@ struct snd_soc_card {struct snd_soc_pcm_runtime *rtd_aux;int num_aux_rtd; +/* +* optional machine audio map. Can be used as an alternative for +* snd_soc_dapm_add_routes call in machine init in single codec setup +* or as a common audio map in cross-device setup +*/ +const struct snd_soc_dapm_route *route; +int num_routes; +struct work_struct deferred_resume_work;/* lists of probed devices belonging to this card */
sound/soc/soc-core.c +21 -0
@@ -1727,6 +1727,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)struct snd_soc_codec *codec;struct snd_soc_codec_conf *codec_conf;enum snd_soc_compress_type compress_type; +const char *temp;int ret, i;mutex_lock (&card->mutex);
@@ -1810,6 +1811,26 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) } } +if (card->route) { +/* +* use the last codec and dapm context of it when setting up +* the common audio map +*/ + codec =list_first_entry (&card->codec_dev_list, + struct snd_soc_codec, card_list); + temp = codec->name_prefix; + codec->name_prefix =NULL ; + ret =snd_soc_dapm_add_routes (&codec->dapm, + card->route, card->num_routes); +if (ret <0 ) { +pr_err ("asoc: failed to add routes %s: %d\n" , + card->name, ret); + goto probe_aux_dev_err; + } + codec->name_prefix = temp; +snd_soc_dapm_sync (&codec->dapm); + } +snprintf (card->snd_card->shortname,sizeof (card->snd_card->shortname),"%s" , card->name); snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
Signature · 1 line
1.7.2.3
Re: [PATCH 2/4] ASoC: Add optional pointer to machine audio routes to snd_soc_card
sound/soc/soc-core.c static void snd_soc_instantiate_card(struct snd_soc_card *card) · line 1824
Quoted 10 lines · Jarkko Nikula
sound/soc/soc-core.c +10
-0+/* +* use the last codec and dapm context of it when setting up +* the common audio map +*/ + codec =list_first_entry (&card->codec_dev_list, + struct snd_soc_codec, card_list); + temp = codec->name_prefix; + codec->name_prefix =NULL ; + ret =snd_soc_dapm_add_routes (&codec->dapm, + card->route, card->num_routes);
Rather than faff around like this it seems we should just bite the bullet and add a DAPM context for the card.
Probably also worth doing the same thing as this for widgets - the combination of these two would eliminate almost all machine init() functions.
PATCH 3/4 ASoC: Add optional pointer to codec interconnects to snd_soc_codec_driver
In reply to Jarkko NikulaThis is aimed to as an alternative to snd_soc_dapm_add_routes call in codec drivers that have only single interconnect map. By doing this in soc-core saves from doing error checking in codec drivers.
This idea came from Mark Brown <[email protected]>.
--- include/sound/soc.h | 8 ++++++++ sound/soc/soc-core.c | 22 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletions(-)
include/sound/soc.h +8 -0
@@ -551,6 +551,14 @@ struct snd_soc_codec_driver {void (*seq_notifier)(struct snd_soc_dapm_context *,enum snd_soc_dapm_type ); + +/* +* optional map of codec audio path interconnects. Can be used as +* an alternative for snd_soc_dapm_add_routes call in codec drivers +* that have only single interconnect map +*/ +const struct snd_soc_dapm_route *route; +int num_routes; };/* SoC platform interface */
sound/soc/soc-core.c +21 -1
@@ -1402,7 +1402,7 @@ static void soc_set_name_prefix(struct snd_soc_card *card,static int soc_probe_codec (struct snd_soc_card *card,struct snd_soc_codec *codec) { -int ret =0 ; +int ret =0 , err; codec->card = card; codec->dapm.card = card;
@@ -1421,6 +1421,18 @@ static int soc_probe_codec(struct snd_soc_card *card, } } +if (codec->driver->route) { + ret =snd_soc_dapm_add_routes (&codec->dapm, + codec->driver->route, + codec->driver->num_routes); +if (ret <0 ) { +dev_err (codec->dev, +"asoc: failed to add interconnects: %d\n" , + ret); + goto err_routes; + } + } +soc_init_codec_debugfs (codec);/* mark codec as probed and add to card codec list */
@@ -1430,6 +1442,14 @@ static int soc_probe_codec(struct snd_soc_card *card,return 0 ; +err_routes: +if (codec->driver->remove) { + err = codec->driver->remove (codec); +if (err <0 ) +dev_err (codec->dev, +"asoc: failed to remove %s: %d\n" , + codec->name, err); + } err_probe:module_put (codec->dev->driver->owner);
Signature · 1 line
1.7.2.3
Re: [PATCH 3/4] ASoC: Add optional pointer to codec interconnects to snd_soc_codec_driver
sound/soc/soc-core.c static void soc_set_name_prefix(struct snd_soc_card *card, · line 1405
Quoted 3 lines · Jarkko Nikula
{
sound/soc/soc-core.c +1
-1-int ret =0 ; +int ret =0 , err;
Looks good but it'd be better to avoid combining initialisation with other variable declarations like this - it's a bit error prone, if only from a legibility point of view.
As for the machines a similar thing for widgets would be nice.
PATCH 4/4 ASoC: Convert bunch of codecs to use soc-core interconnect registration
In reply to Jarkko NikulaThese codec drivers have only single interconnect map so these can be switched to use soc-core based interconnect registration.
This simplifies those codecs that check the return value of snd_soc_dapm_add_routes and adds a failure path to those that don't.
---
Only twl4030 tested and rest by compilation only.
--- sound/soc/codecs/88pm860x-codec.c | 3 ++- sound/soc/codecs/ad1836.c | 3 ++- sound/soc/codecs/ad193x.c | 4 +++- sound/soc/codecs/ak4535.c | 3 ++- sound/soc/codecs/ak4671.c | 3 ++- sound/soc/codecs/cs42l51.c | 4 ++-- sound/soc/codecs/cx20442.c | 4 ++-- sound/soc/codecs/jz4740.c | 5 ++--- sound/soc/codecs/max98088.c | 4 ++-- sound/soc/codecs/sn95031.c | 6 ++---- sound/soc/codecs/ssm2602.c | 3 ++- sound/soc/codecs/tlv320aic23.c | 4 ++-- sound/soc/codecs/tlv320dac33.c | 4 ++-- sound/soc/codecs/twl4030.c | 3 ++- sound/soc/codecs/twl6040.c | 3 ++- sound/soc/codecs/uda1380.c | 3 ++- sound/soc/codecs/wm8350.c | 15 ++++----------- sound/soc/codecs/wm8400.c | 3 ++- sound/soc/codecs/wm8510.c | 3 ++- sound/soc/codecs/wm8523.c | 3 ++- sound/soc/codecs/wm8580.c | 3 ++- sound/soc/codecs/wm8711.c | 3 ++- sound/soc/codecs/wm8728.c | 3 ++- sound/soc/codecs/wm8731.c | 3 ++- sound/soc/codecs/wm8737.c | 3 ++- sound/soc/codecs/wm8741.c | 3 ++- sound/soc/codecs/wm8750.c | 3 ++- sound/soc/codecs/wm8753.c | 3 ++- sound/soc/codecs/wm8770.c | 6 +++--- sound/soc/codecs/wm8776.c | 3 ++- sound/soc/codecs/wm8900.c | 3 ++- sound/soc/codecs/wm8903.c | 3 ++- sound/soc/codecs/wm8940.c | 15 ++++----------- sound/soc/codecs/wm8955.c | 4 ++-- sound/soc/codecs/wm8961.c | 3 ++- sound/soc/codecs/wm8971.c | 3 ++- sound/soc/codecs/wm8974.c | 3 ++- sound/soc/codecs/wm8978.c | 4 ++-- sound/soc/codecs/wm8985.c | 6 +++--- sound/soc/codecs/wm8988.c | 3 ++- sound/soc/codecs/wm8990.c | 4 ++-- sound/soc/codecs/wm8991.c | 6 +++--- sound/soc/codecs/wm8993.c | 3 ++- sound/soc/codecs/wm8995.c | 6 +++--- sound/soc/codecs/wm9081.c | 3 ++- sound/soc/codecs/wm9705.c | 3 ++- sound/soc/codecs/wm9712.c | 3 ++- sound/soc/codecs/wm9713.c | 4 ++-- 48 files changed, 105 insertions(+), 90 deletions(-)
sound/soc/codecs/88pm860x-codec.c +2 -1
@@ -1382,7 +1382,6 @@ static int pm860x_probe(struct snd_soc_codec *codec) ARRAY_SIZE(pm860x_snd_controls));snd_soc_dapm_new_controls (dapm, pm860x_dapm_widgets,ARRAY_SIZE (pm860x_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; out:
@@ -1410,6 +1409,8 @@ static struct snd_soc_codec_driver soc_codec_dev_pm860x = { .reg_cache_size = REG_CACHE_SIZE, .reg_word_size = sizeof(u8), .set_bias_level = pm860x_set_bias_level, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static int __devinit pm860x_codec_probe (struct platform_device *pdev)
sound/soc/codecs/ad1836.c +2 -1
@@ -253,7 +253,6 @@ static int ad1836_probe(struct snd_soc_codec *codec) ARRAY_SIZE(ad1836_snd_controls));snd_soc_dapm_new_controls (dapm, ad1836_dapm_widgets,ARRAY_SIZE (ad1836_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_paths,ARRAY_SIZE (audio_paths));return ret; }
@@ -275,6 +274,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1836 = { .resume = ad1836_soc_resume, .reg_cache_size = AD1836_NUM_REGS, .reg_word_size = sizeof(u16), + .route = audio_paths, + .num_routes = ARRAY_SIZE(audio_paths), };static int __devinit ad1836_spi_probe (struct spi_device *spi)
sound/soc/codecs/ad193x.c +3 -1
@@ -385,7 +385,6 @@ static int ad193x_probe(struct snd_soc_codec *codec) ARRAY_SIZE(ad193x_snd_controls));snd_soc_dapm_new_controls (dapm, ad193x_dapm_widgets,ARRAY_SIZE (ad193x_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_paths,ARRAY_SIZE (audio_paths));return ret; }
@@ -395,6 +394,9 @@ static struct snd_soc_codec_driver soc_codec_dev_ad193x = { .reg_cache_default = ad193x_reg, .reg_cache_size = AD193X_NUM_REGS, .reg_word_size = sizeof(u16), + .route = audio_paths, + .num_routes = ARRAY_SIZE(audio_paths), + };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/ak4535.c +2 -1
@@ -293,7 +293,6 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, ak4535_dapm_widgets,ARRAY_SIZE (ak4535_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -480,6 +479,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = { .reg_cache_size = ARRAY_SIZE(ak4535_reg), .reg_word_size = sizeof(u8), .reg_cache_default = ak4535_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/ak4671.c +2 -1
@@ -439,7 +439,6 @@ static int ak4671_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, ak4671_dapm_widgets,ARRAY_SIZE (ak4671_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -670,6 +669,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = { .reg_cache_size = AK4671_CACHEREGNUM, .reg_word_size = sizeof(u8), .reg_cache_default = ak4671_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), }; static int __devinit ak4671_i2c_probe(struct i2c_client *client,
sound/soc/codecs/cs42l51.c +2 -2
@@ -551,8 +551,6 @@ static int cs42l51_probe(struct snd_soc_codec *codec) ARRAY_SIZE(cs42l51_snd_controls));snd_soc_dapm_new_controls (dapm, cs42l51_dapm_widgets,ARRAY_SIZE (cs42l51_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, cs42l51_routes, -ARRAY_SIZE (cs42l51_routes));return 0 ; }
@@ -561,6 +559,8 @@ static struct snd_soc_codec_driver soc_codec_device_cs42l51 = { .probe = cs42l51_probe, .reg_cache_size = CS42L51_NUMREGS, .reg_word_size = sizeof(u8), + .route = cs42l51_routes, + .num_routes = ARRAY_SIZE(cs42l51_routes), }; static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
sound/soc/codecs/cx20442.c +2 -2
@@ -92,8 +92,6 @@ static int cx20442_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, cx20442_dapm_widgets,ARRAY_SIZE (cx20442_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, cx20442_audio_map, -ARRAY_SIZE (cx20442_audio_map));return 0 ; }
@@ -374,6 +372,8 @@ static struct snd_soc_codec_driver cx20442_codec_dev = { .reg_word_size = sizeof(u8), .read = cx20442_read_reg_cache, .write = cx20442_write, + .route = cx20442_audio_map, + .num_routes = ARRAY_SIZE(cx20442_audio_map), };static int cx20442_platform_probe (struct platform_device *pdev)
sound/soc/codecs/jz4740.c +2 -3
@@ -305,9 +305,6 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, jz4740_codec_dapm_widgets,ARRAY_SIZE (jz4740_codec_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, jz4740_codec_dapm_routes, -ARRAY_SIZE (jz4740_codec_dapm_routes)); -snd_soc_dapm_new_widgets (codec);jz4740_codec_set_bias_level (codec,SND_SOC_BIAS_STANDBY );
@@ -350,6 +347,8 @@ static struct snd_soc_codec_driver soc_codec_dev_jz4740_codec = { .reg_cache_default = jz4740_codec_regs, .reg_word_size = sizeof(u32), .reg_cache_size = 2, + .route = jz4740_codec_dapm_routes, + .num_routes = ARRAY_SIZE(jz4740_codec_dapm_routes), };static int __devinit jz4740_codec_probe (struct platform_device *pdev)
sound/soc/codecs/max98088.c +2 -2
@@ -1233,8 +1233,6 @@ static int max98088_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, max98088_dapm_widgets,ARRAY_SIZE (max98088_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); -snd_soc_add_controls (codec, max98088_snd_controls,ARRAY_SIZE (max98088_snd_controls));
@@ -2036,6 +2034,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = { .reg_word_size = sizeof(u8), .reg_cache_default = max98088_reg, .volatile_register = max98088_volatile_register, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), }; static int max98088_i2c_probe(struct i2c_client *i2c,
sound/soc/codecs/sn95031.c +2 -4
@@ -427,10 +427,6 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) ARRAY_SIZE(sn95031_dapm_widgets));if (ret)pr_err ("soc_dapm_new_control failed %d" , ret); - ret =snd_soc_dapm_add_routes (&codec->dapm, sn95031_audio_map, -ARRAY_SIZE (sn95031_audio_map)); -if (ret) -pr_err ("soc_dapm_add_routes failed %d" , ret);return ret; }
@@ -449,6 +445,8 @@ struct snd_soc_codec_driver sn95031_codec = { .read = sn95031_read, .write = sn95031_write, .set_bias_level = sn95031_set_vaud_bias, + .route = sn95031_audio_map, + .num_routes = ARRAY_SIZE(sn95031_audio_map), };static int __devinit sn95031_device_probe (struct platform_device *pdev)
sound/soc/codecs/ssm2602.c +2 -1
@@ -210,7 +210,6 @@ static int ssm2602_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, ssm2602_dapm_widgets,ARRAY_SIZE (ssm2602_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_conn,ARRAY_SIZE (audio_conn));return 0 ; }
@@ -605,6 +604,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { .reg_cache_size = sizeof(ssm2602_reg), .reg_word_size = sizeof(u16), .reg_cache_default = ssm2602_reg, + .route = audio_conn, + .num_routes = ARRAY_SIZE(audio_conn), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/tlv320aic23.c +2 -2
@@ -394,8 +394,6 @@ static int tlv320aic23_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, tlv320aic23_dapm_widgets,ARRAY_SIZE (tlv320aic23_dapm_widgets)); -/* set up audio path interconnects */ -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -698,6 +696,8 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = { .read = tlv320aic23_read_reg_cache, .write = tlv320aic23_write, .set_bias_level = tlv320aic23_set_bias_level, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/tlv320dac33.c +2 -2
@@ -623,8 +623,6 @@ static int dac33_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, dac33_dapm_widgets,ARRAY_SIZE (dac33_dapm_widgets)); -/* set up audio path interconnects */ -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -1491,6 +1489,8 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .remove = dac33_soc_remove, .suspend = dac33_soc_suspend, .resume = dac33_soc_resume, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#define DAC33_RATES (SNDRV_PCM_RATE_44100 | \
sound/soc/codecs/twl4030.c +2 -1
@@ -1639,7 +1639,6 @@ static int twl4030_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, twl4030_dapm_widgets,ARRAY_SIZE (twl4030_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -2293,6 +2292,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { .reg_cache_size = sizeof(twl4030_reg), .reg_word_size = sizeof(u8), .reg_cache_default = twl4030_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };static int __devinit twl4030_codec_probe (struct platform_device *pdev)
sound/soc/codecs/twl6040.c +2 -1
@@ -1225,7 +1225,6 @@ static int twl6040_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, twl6040_dapm_widgets,ARRAY_SIZE (twl6040_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));snd_soc_dapm_new_widgets (dapm);return 0 ;
@@ -1747,6 +1746,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .reg_cache_size = ARRAY_SIZE(twl6040_reg), .reg_word_size = sizeof(u8), .reg_cache_default = twl6040_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };static int __devinit twl6040_codec_probe (struct platform_device *pdev)
sound/soc/codecs/uda1380.c +2 -1
@@ -416,7 +416,6 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, uda1380_dapm_widgets,ARRAY_SIZE (uda1380_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -814,6 +813,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { .reg_word_size = sizeof(u16), .reg_cache_default = uda1380_reg, .reg_cache_step = 1, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8350.c +4 -11
@@ -794,19 +794,10 @@ static int wm8350_add_widgets(struct snd_soc_codec *codec) ret =snd_soc_dapm_new_controls (dapm, wm8350_dapm_widgets,ARRAY_SIZE (wm8350_dapm_widgets)); -if (ret !=0 ) { +if (ret !=0 )dev_err (codec->dev,"dapm control register failed\n" ); -return ret; - } - -/* set up audio paths */ - ret =snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); -if (ret !=0 ) { -dev_err (codec->dev,"DAPM route register failed\n" ); -return ret; - } -return 0 ; +return ret; } static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
@@ -1697,6 +1688,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { .read = wm8350_codec_read, .write = wm8350_codec_write, .set_bias_level = wm8350_set_bias_level, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static int __devinit wm8350_probe (struct platform_device *pdev)
sound/soc/codecs/wm8400.c +2 -1
@@ -914,7 +914,6 @@ static int wm8400_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8400_dapm_widgets,ARRAY_SIZE (wm8400_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -1453,6 +1452,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { .read = wm8400_read, .write = wm8400_write, .set_bias_level = wm8400_set_bias_level, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static int __devinit wm8400_probe (struct platform_device *pdev)
sound/soc/codecs/wm8510.c +2 -1
@@ -219,7 +219,6 @@ static int wm8510_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8510_dapm_widgets,ARRAY_SIZE (wm8510_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -596,6 +595,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8510 = { .reg_cache_size = ARRAY_SIZE(wm8510_reg), .reg_word_size = sizeof(u16), .reg_cache_default =wm8510_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8523.c +2 -1
@@ -112,7 +112,6 @@ static int wm8523_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8523_dapm_widgets,ARRAY_SIZE (wm8523_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -512,6 +511,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8523 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm8523_reg, .volatile_register = wm8523_volatile_register, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8580.c +2 -1
@@ -304,7 +304,6 @@ static int wm8580_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8580_dapm_widgets,ARRAY_SIZE (wm8580_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -905,6 +904,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = { .reg_cache_size = ARRAY_SIZE(wm8580_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8580_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8711.c +2 -1
@@ -95,7 +95,6 @@ static int wm8711_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8711_dapm_widgets,ARRAY_SIZE (wm8711_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -420,6 +419,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { .reg_cache_size = ARRAY_SIZE(wm8711_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8711_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8728.c +2 -1
@@ -76,7 +76,6 @@ static int wm8728_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8728_dapm_widgets,ARRAY_SIZE (wm8728_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -275,6 +274,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = { .reg_cache_size = ARRAY_SIZE(wm8728_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8728_reg_defaults, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8731.c +2 -1
@@ -233,7 +233,6 @@ static int wm8731_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8731_dapm_widgets,ARRAY_SIZE (wm8731_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -636,6 +635,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .reg_cache_size = ARRAY_SIZE(wm8731_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8731_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8737.c +2 -1
@@ -272,7 +272,6 @@ static int wm8737_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8737_dapm_widgets,ARRAY_SIZE (wm8737_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -632,6 +631,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { .reg_cache_size = WM8737_REGISTER_COUNT - 1, /* Skip reset */ .reg_word_size = sizeof(u16), .reg_cache_default = wm8737_reg, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8741.c +2 -1
@@ -97,7 +97,6 @@ static int wm8741_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8741_dapm_widgets,ARRAY_SIZE (wm8741_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -459,6 +458,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8741_reg_defaults, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8750.c +2 -1
@@ -401,7 +401,6 @@ static int wm8750_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8750_dapm_widgets,ARRAY_SIZE (wm8750_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -749,6 +748,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = { .reg_cache_size = ARRAY_SIZE(wm8750_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8750_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8753.c +2 -1
@@ -626,7 +626,6 @@ static int wm8753_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8753_dapm_widgets,ARRAY_SIZE (wm8753_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -1542,6 +1541,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8753 = { .reg_cache_size = ARRAY_SIZE(wm8753_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8753_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8770.c +3 -3
@@ -647,8 +647,6 @@ static int wm8770_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8770_snd_controls));snd_soc_dapm_new_controls (&codec->dapm, wm8770_dapm_widgets,ARRAY_SIZE (wm8770_dapm_widgets)); -snd_soc_dapm_add_routes (&codec->dapm, wm8770_intercon, -ARRAY_SIZE (wm8770_intercon));return 0 ; err_reg_enable:
@@ -681,7 +679,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { .set_bias_level = wm8770_set_bias_level, .reg_cache_size = ARRAY_SIZE(wm8770_reg_defs), .reg_word_size = sizeof (u16), - .reg_cache_default = wm8770_reg_defs + .reg_cache_default = wm8770_reg_defs, + .route = wm8770_intercon, + .num_routes = ARRAY_SIZE(wm8770_intercon), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8776.c +2 -1
@@ -429,7 +429,6 @@ static int wm8776_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8776_snd_controls));snd_soc_dapm_new_controls (dapm, wm8776_dapm_widgets,ARRAY_SIZE (wm8776_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, routes,ARRAY_SIZE (routes));return ret; }
@@ -450,6 +449,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = { .reg_cache_size = ARRAY_SIZE(wm8776_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8776_reg, + .route = routes, + .num_routes = ARRAY_SIZE(routes), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8900.c +2 -1
@@ -613,7 +613,6 @@ static int wm8900_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8900_dapm_widgets,ARRAY_SIZE (wm8900_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -1252,6 +1251,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = { .reg_cache_size = ARRAY_SIZE(wm8900_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8900_reg_defaults, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8903.c +2 -1
@@ -1011,7 +1011,6 @@ static int wm8903_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8903_dapm_widgets,ARRAY_SIZE (wm8903_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon));return 0 ; }
@@ -1893,6 +1892,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm8903_reg_defaults, .volatile_register = wm8903_volatile_register, + .route = intercon, + .num_routes = ARRAY_SIZE(intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8940.c +4 -11
@@ -290,18 +290,9 @@ static const struct snd_soc_dapm_route audio_map[] = {static int wm8940_add_widgets (struct snd_soc_codec *codec) {struct snd_soc_dapm_context *dapm = &codec->dapm; -int ret; - - ret =snd_soc_dapm_new_controls (dapm, wm8940_dapm_widgets, -ARRAY_SIZE (wm8940_dapm_widgets)); -if (ret) - goto error_ret; - ret =snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); -if (ret) - goto error_ret; -error_ret: -return ret; +return snd_soc_dapm_new_controls (dapm, wm8940_dapm_widgets, +ARRAY_SIZE (wm8940_dapm_widgets)); }#define wm8940_reset (c) snd_soc_write(c, WM8940_SOFTRESET, 0);
@@ -751,6 +742,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = { .reg_cache_size = ARRAY_SIZE(wm8940_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8940_reg_defaults, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8955.c +2 -2
@@ -582,8 +582,6 @@ static int wm8955_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8955_dapm_widgets,ARRAY_SIZE (wm8955_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, wm8955_intercon, -ARRAY_SIZE (wm8955_intercon));return 0 ; }
@@ -1000,6 +998,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8955 = { .reg_cache_size = ARRAY_SIZE(wm8955_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8955_reg, + .route = wm8955_intercon, + .num_routes = ARRAY_SIZE(wm8955_intercon), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8961.c +2 -1
@@ -1025,7 +1025,6 @@ static int wm8961_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8961_snd_controls));snd_soc_dapm_new_controls (dapm, wm8961_dapm_widgets,ARRAY_SIZE (wm8961_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_paths,ARRAY_SIZE (audio_paths));return 0 ; }
@@ -1078,6 +1077,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm8961_reg_defaults, .volatile_register = wm8961_volatile_register, + .route = audio_paths, + .num_routes = ARRAY_SIZE(audio_paths), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8971.c +2 -1
@@ -336,7 +336,6 @@ static int wm8971_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8971_dapm_widgets,ARRAY_SIZE (wm8971_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -707,6 +706,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { .reg_cache_size = ARRAY_SIZE(wm8971_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8971_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8974.c +2 -1
@@ -276,7 +276,6 @@ static int wm8974_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8974_dapm_widgets,ARRAY_SIZE (wm8974_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -644,6 +643,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { .reg_cache_size = ARRAY_SIZE(wm8974_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8974_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8978.c +2 -2
@@ -357,8 +357,6 @@ static int wm8978_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8978_dapm_widgets,ARRAY_SIZE (wm8978_dapm_widgets)); -/* set up the WM8978 audio map */ -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -999,6 +997,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .reg_cache_size = ARRAY_SIZE(wm8978_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8978_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8985.c +3 -3
@@ -536,8 +536,6 @@ static int wm8985_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8985_dapm_widgets,ARRAY_SIZE (wm8985_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map, -ARRAY_SIZE (audio_map));return 0 ; }
@@ -1069,7 +1067,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8985 = { .set_bias_level = wm8985_set_bias_level, .reg_cache_size = ARRAY_SIZE(wm8985_reg_defs), .reg_word_size = sizeof(u16), - .reg_cache_default = wm8985_reg_defs + .reg_cache_default = wm8985_reg_defs, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8988.c +2 -1
@@ -791,7 +791,6 @@ static int wm8988_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8988_snd_controls));snd_soc_dapm_new_controls (dapm, wm8988_dapm_widgets,ARRAY_SIZE (wm8988_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -811,6 +810,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8988 = { .reg_cache_size = ARRAY_SIZE(wm8988_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8988_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm8990.c +2 -2
@@ -917,8 +917,6 @@ static int wm8990_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm8990_dapm_widgets,ARRAY_SIZE (wm8990_dapm_widgets)); -/* set up the WM8990 audio map */ -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -1392,6 +1390,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = { .reg_cache_size = ARRAY_SIZE(wm8990_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8990_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8991.c +3 -3
@@ -1306,8 +1306,6 @@ static int wm8991_probe(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (&codec->dapm, wm8991_dapm_widgets,ARRAY_SIZE (wm8991_dapm_widgets)); -snd_soc_dapm_add_routes (&codec->dapm, audio_map, -ARRAY_SIZE (audio_map));return 0 ; }
@@ -1358,7 +1356,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8991 = { .set_bias_level = wm8991_set_bias_level, .reg_cache_size = WM8991_MAX_REGISTER + 1, .reg_word_size = sizeof(u16), - .reg_cache_default = wm8991_reg_defs + .reg_cache_default = wm8991_reg_defs, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), }; static __devinit int wm8991_i2c_probe(struct i2c_client *i2c,
sound/soc/codecs/wm8993.c +2 -1
@@ -1514,7 +1514,6 @@ static int wm8993_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8993_dapm_widgets));wm_hubs_add_analogue_controls (codec); -snd_soc_dapm_add_routes (dapm, routes,ARRAY_SIZE (routes));wm_hubs_add_analogue_routes (codec, wm8993->pdata.lineout1_diff, wm8993->pdata.lineout2_diff);
@@ -1597,6 +1596,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm8993_reg_defaults, .volatile_register = wm8993_volatile, + .route = routes, + .num_routes = ARRAY_SIZE(routes), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm8995.c +3 -3
@@ -1679,8 +1679,6 @@ static int wm8995_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8995_snd_controls));snd_soc_dapm_new_controls (&codec->dapm, wm8995_dapm_widgets,ARRAY_SIZE (wm8995_dapm_widgets)); -snd_soc_dapm_add_routes (&codec->dapm, wm8995_intercon, -ARRAY_SIZE (wm8995_intercon));return 0 ;
@@ -1783,7 +1781,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8995 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm8995_reg_defs, .volatile_register = wm8995_volatile, - .compress_type = SND_SOC_RBTREE_COMPRESSION + .compress_type = SND_SOC_RBTREE_COMPRESSION, + .route = wm8995_intercon, + .num_routes = ARRAY_SIZE(wm8995_intercon), };#if defined(CONFIG_SPI_MASTER )
sound/soc/codecs/wm9081.c +2 -1
@@ -1274,7 +1274,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm9081_dapm_widgets,ARRAY_SIZE (wm9081_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_paths,ARRAY_SIZE (audio_paths));return ret; }
@@ -1324,6 +1323,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { .reg_word_size = sizeof(u16), .reg_cache_default = wm9081_reg_defaults, .volatile_register = wm9081_volatile_register, + .route = audio_paths, + .num_routes = ARRAY_SIZE(audio_paths), };#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
sound/soc/codecs/wm9705.c +2 -1
@@ -206,7 +206,6 @@ static int wm9705_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm9705_dapm_widgets,ARRAY_SIZE (wm9705_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -390,6 +389,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9705_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static __devinit int wm9705_probe (struct platform_device *pdev)
sound/soc/codecs/wm9712.c +2 -1
@@ -435,7 +435,6 @@ static int wm9712_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm9712_dapm_widgets,ARRAY_SIZE (wm9712_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map));return 0 ; }
@@ -678,6 +677,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9712_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static __devinit int wm9712_probe (struct platform_device *pdev)
sound/soc/codecs/wm9713.c +2 -2
@@ -651,8 +651,6 @@ static int wm9713_add_widgets(struct snd_soc_codec *codec)snd_soc_dapm_new_controls (dapm, wm9713_dapm_widgets,ARRAY_SIZE (wm9713_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); -return 0 ; }
@@ -1262,6 +1260,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = wm9713_reg, + .route = audio_map, + .num_routes = ARRAY_SIZE(audio_map), };static __devinit int wm9713_probe (struct platform_device *pdev)
Signature · 1 line
1.7.2.3
Re: [PATCH 4/4] ASoC: Convert bunch of codecs to use soc-core interconnect registration
Quoted 1 line · Jarkko Nikula
sound/soc/codecs/wm8993.c | 3 ++-
Please avoid doing this for wm8993 and anything else which either conditionally builds up the DAPM map or does so in multiple stages - I don't actually think there's a problem here but I'd ratehr be as cautious as possible.
Re: [PATCH 4/4] ASoC: Convert bunch of codecs to use soc-core interconnect registration
Quoted 8 lines · On Wed, 26 Jan 2011 13:28:13 +0000 Mark Brown…
Quoted 1 line · Jarkko Nikula
sound/soc/codecs/wm8993.c | 3 ++-Please avoid doing this for wm8993 and anything else which either conditionally builds up the DAPM map or does so in multiple stages - I don't actually think there's a problem here but I'd ratehr be as cautious as possible.
Oops, yeah. I didn't notice there were this wm_hubs_add_analogue_routes call... I update the patch.
Signature · 1 line
Jarkko
Re: [PATCH 4/4] ASoC: Convert bunch of codecs to use soc-core interconnect registration
In reply to Jarkko NikulaQuoted 5 lines · ext Jarkko Nikula
These codec drivers have only single interconnect map so these can be switched to use soc-core based interconnect registration.
This simplifies those codecs that check the return value of
snd_soc_dapm_add_routesand adds a failure path to those that don't.
I might be missing something, but the only benefit of the 3+4 patch is actually the failure check for the snd_soc_dapm_add_routes, which was not done for most of the codecs, but now it is done in the core. On the other hand, now we always have one check for the codec->driver->route in soc_probe_codec.
I don't see how these actually simplifies the codec drivers. We had a single snd_soc_dapm_add_routes call before the patches, now we have two fields to fill in snd_soc_codec_driver...
Signature · 1 line
Péter
Re: [PATCH 4/4] ASoC: Convert bunch of codecs to use soc-core interconnect registration
Quoted 7 lines · On Thu, 27 Jan 2011 08:57:09 +0200 Peter Ujfalusi <[email protected]>…
Quoted 5 lines · ext Jarkko Nikula
These codec drivers have only single interconnect map so these can be switched to use soc-core based interconnect registration.
This simplifies those codecs that check the return value of
snd_soc_dapm_add_routesand adds a failure path to those that don't.
Quoted 9 lines
I might be missing something, but the only benefit of the 3+4 patch is actually the failure check for the
snd_soc_dapm_add_routes, which was not done for most of the codecs, but now it is done in the core. On the other hand, now we always have one check for thecodec->driver->routeinsoc_probe_codec.
I don't see how these actually simplifies the codec drivers. We had a singlesnd_soc_dapm_add_routescall before the patches, now we have two fields to fill insnd_soc_codec_driver...
Yeah, simplification comes only if a driver is checking the return value what most are not doing currently.
Another issue that came to my mind if some drivers need to add additional interconnects later then there's basically need to revert the 4/4 for those codecs. However, I don't think there are many codecs that will do that.
Signature · 1 line
Jarkko
Re: [PATCH 4/4] ASoC: Convert bunch of codecs to use soc-core interconnect registration
Quoted 8 lines · Jarkko Nikula
Quoted 3 lines · Peter Ujfalusi
I don't see how these actually simplifies the codec drivers. We had a single
snd_soc_dapm_add_routescall before the patches, now we have two fields to fill insnd_soc_codec_driver...Yeah, simplification comes only if a driver is checking the return value what most are not doing currently.
For me anything that moves things from code to data structures is a simplification since it reduces the variation between drivers. It's not going to make a massive difference either way to the driver itself but it makes life easier if you want to do something to all drivers.
Quoted 7 lines · On Wed, 26 Jan 2011 13:58:14 +0200 Jarkko Nikula <[email protected]> wrote:
Commit f6c2ed5 "ASoC: Fix the device references to codec and platform drivers" moved codec and platform driver refcount increments from
soc_bind_dai_linkto more appropriate places.Adjust a little them so that refcounts are incremented before executing the driver probe functions.
Quoted 6 lines
Signed-off-by Jarkko Nikula <[email protected]>Cc Vinod Koul <[email protected]>Cc Harsha Priya <[email protected]>---
I don't know any regression with this so probably 2.6.39 material.
---
Actually I found a regression that I like to fix before this. There's a try_module_get in soc_probe_aux_dev that the commit f6c2ed5 didn't remove and for auxialiry devices there will be then two try_module_get calls since another is in soc_probe_codec.
Signature · 1 line
Jarkko