Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23', 'asoc...

diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 410cae0f2060474313872d6b9110bf05d3368e43..628a8eeaab689eb85b6d3dba54ec5a98aefe6da0 100644 (file)
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -174,10 +174,9 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
        {"ROUT", NULL, "Output Mixer"},
 
        /* Inputs */
-       {"Line Input", "NULL", "LLINEIN"},
-       {"Line Input", "NULL", "RLINEIN"},
-
-       {"Mic Input", "NULL", "MICIN"},
+       {"Line Input", NULL, "LLINEIN"},
+       {"Line Input", NULL, "RLINEIN"},
+       {"Mic Input", NULL, "MICIN"},
 
        /* input mux */
        {"Capture Source", "Line", "Line Input"},

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 748036e851ea4d129266ca1e4d97b38e387c4eed..2b6ad09e08868323e3e9bef25bd26b33bb5e2949 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -606,6 +606,14 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
                twl6040_headset_power_get_enum,
                twl6040_headset_power_put_enum),
 
+       /* Left HS PDM data routed to Right HSDAC */
+       SOC_SINGLE("Headset Mono to Stereo Playback Switch",
+               TWL6040_REG_HSRCTL, 7, 1, 0),
+
+       /* Left HF PDM data routed to Right HFDAC */
+       SOC_SINGLE("Handsfree Mono to Stereo Playback Switch",
+               TWL6040_REG_HFRCTL, 5, 1, 0),
+
        SOC_ENUM_EXT("PLL Selection", twl6040_power_mode_enum,
                twl6040_pll_get_enum, twl6040_pll_put_enum),
 };

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 058bc99c6c3479e4d7a92c97a885f634b168105d..002772e3ba2cb5f193ef35b4b96c8ee6eadc46d1 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -495,12 +495,13 @@ static void remove_widget(struct snd_soc_component *comp,
                        struct snd_kcontrol *kcontrol = w->kcontrols[i];
                        struct soc_enum *se =
                                (struct soc_enum *)kcontrol->private_value;
+                       int j;
 
                        snd_ctl_remove(card, kcontrol);
 
                        kfree(se->dobj.control.dvalues);
-                       for (i = 0; i < se->items; i++)
-                               kfree(se->dobj.control.dtexts[i]);
+                       for (j = 0; j < se->items; j++)
+                               kfree(se->dobj.control.dtexts[j]);
 
                        kfree(se);
                }

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index a68368edab9c5df89a32e3678f7c9a65988b5463..affad46bf1887d08b78fb89394168ca36bef2fcc 100644 (file)
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -318,7 +318,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
        ac97 = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_ac97),
                            GFP_KERNEL);
        if (!ac97) {
-               dev_err(&pdev->dev, "Can't allocate tegra20_ac97\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c
index 89add13c31cfc08259bd97d91555b70886117b77..4024e3abbeed0ef1a144017341116bb7d81c81d7 100644 (file)
--- a/sound/soc/tegra/tegra20_das.c
+++ b/sound/soc/tegra/tegra20_das.c
@@ -41,6 +41,7 @@ static inline void tegra20_das_write(u32 reg, u32 val)
 static inline u32 tegra20_das_read(u32 reg)
 {
        u32 val;
+
        regmap_read(das->regmap, reg, &val);
        return val;
 }
@@ -142,7 +143,6 @@ static int tegra20_das_probe(struct platform_device *pdev)
 
        das = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_das), GFP_KERNEL);
        if (!das) {
-               dev_err(&pdev->dev, "Can't allocate tegra20_das\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 14106fa82bca3ed821c2a2ad9977c2856e37bbf8..26253c2849e7945acaf69f767d9f23dbaac6850b 100644 (file)
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -345,7 +345,6 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
 
        i2s = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_i2s), GFP_KERNEL);
        if (!i2s) {
-               dev_err(&pdev->dev, "Can't allocate tegra20_i2s\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index a0c3640572b98a80a48601093d3848d2341a8509..767c0491e11abecf2545f574ac28ff6cdc2e0e29 100644 (file)
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -271,10 +271,9 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
 
        spdif = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_spdif),
                             GFP_KERNEL);
-       if (!spdif) {
-               dev_err(&pdev->dev, "Can't allocate tegra20_spdif\n");
+       if (!spdif)
                return -ENOMEM;
-       }
+
        dev_set_drvdata(&pdev->dev, spdif);
 
        spdif->clk_spdif_out = devm_clk_get(&pdev->dev, "spdif_out");

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index fef3b9a21a667304ca94579c5511c6ea3f58c073..8c10ae7982bad992cc94f60db565ee3791f7bc3a 100644 (file)
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -41,6 +41,7 @@ static inline void tegra30_apbif_write(u32 reg, u32 val)
 static inline u32 tegra30_apbif_read(u32 reg)
 {
        u32 val;
+
        regmap_read(ahub->regmap_apbif, reg, &val);
        return val;
 }
@@ -560,10 +561,8 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
 
        ahub = devm_kzalloc(&pdev->dev, sizeof(struct tegra30_ahub),
                            GFP_KERNEL);
-       if (!ahub) {
-               dev_err(&pdev->dev, "Can't allocate tegra30_ahub\n");
+       if (!ahub)
                return -ENOMEM;
-       }
        dev_set_drvdata(&pdev->dev, ahub);
 
        ahub->soc_data = soc_data;

diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 8e55583aa104e1c847b2c64700b90a564378ddf4..b2b279c96029d90e5039701b5d8e2c955db2d43c 100644 (file)
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -385,7 +385,6 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
 
        i2s = devm_kzalloc(&pdev->dev, sizeof(struct tegra30_i2s), GFP_KERNEL);
        if (!i2s) {
-               dev_err(&pdev->dev, "Can't allocate tegra30_i2s\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index eead6e7f205bedb88e992f55d6d7ab1de9bb75e2..0509902512ccd38a02376c0dc41a603d75f9a572 100644 (file)
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -169,10 +169,8 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
 
        alc5632 = devm_kzalloc(&pdev->dev,
                        sizeof(struct tegra_alc5632), GFP_KERNEL);
-       if (!alc5632) {
-               dev_err(&pdev->dev, "Can't allocate tegra_alc5632\n");
+       if (!alc5632)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index a403db6d563e7cdaa2f0248212a40a3404b79d05..c34a54d6e8121b9a6ba6c2b996112908eac25778 100644 (file)
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -225,10 +225,8 @@ static int tegra_max98090_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev,
                        sizeof(struct tegra_max98090), GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_max98090\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 25b9fc03ba6232a821c6730643e123bf8cb76c77..93a356802345aeefd00c4171fd55032c9802e15c 100644 (file)
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -170,10 +170,8 @@ static int tegra_rt5640_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev,
                        sizeof(struct tegra_rt5640), GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_rt5640\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index 4bbab098f50b92131c0c47f029a2edff8d16a6b1..6dda01f6998349d6d6f80d629af08480392bf776 100644 (file)
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -120,10 +120,8 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_sgtl5000),
                               GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_sgtl5000 struct\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index bdedd1028569a68362c8bdeaf036fe0931d8b43a..d0ab0026a4cd879e906d388979d0f02af52d0c56 100644 (file)
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -128,10 +128,8 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm8753),
                               GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_wm8753 struct\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 2013e9c4bba0cfe32572997094243008a5c01b4c..dbfb49298ae8bea177237482f9d8dc58169bdf1e 100644 (file)
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -248,10 +248,8 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm8903),
                               GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_wm8903 struct\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 6492f8143ff1f172d3bcd5007b3ea1049cdc9e2f..c9cd2243262715ecfd929b44c6e7c99dee1d7aac 100644 (file)
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -77,10 +77,8 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev)
 
        machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm9712),
                               GFP_KERNEL);
-       if (!machine) {
-               dev_err(&pdev->dev, "Can't allocate tegra_wm9712 struct\n");
+       if (!machine)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index 870f84ab50054ece92d3b42786ec629727d4c044..c9dcad9bb93123b6b901ad3a3db33bfad0f3b19e 100644 (file)
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -123,10 +123,8 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
 
        trimslice = devm_kzalloc(&pdev->dev, sizeof(struct tegra_trimslice),
                                 GFP_KERNEL);
-       if (!trimslice) {
-               dev_err(&pdev->dev, "Can't allocate tegra_trimslice\n");
+       if (!trimslice)
                return -ENOMEM;
-       }
 
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);

diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index a8f705bb60dc087a733e74031a777d91e20b09fe..7912bf09dc4d70c66f19316c6c8f2b5a0d60357c 100644 (file)
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -206,7 +206,7 @@ static void txx9aclc_dma_tasklet(unsigned long data)
 static int txx9aclc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
        struct txx9aclc_dmadata *dmadata = substream->runtime->private_data;
-       struct txx9aclc_plat_drvdata *drvdata =txx9aclc_drvdata;
+       struct txx9aclc_plat_drvdata *drvdata = txx9aclc_drvdata;
        void __iomem *base = drvdata->base;
        unsigned long flags;
        int ret = 0;
@@ -340,7 +340,7 @@ static bool filter(struct dma_chan *chan, void *param)
 static int txx9aclc_dma_init(struct txx9aclc_soc_device *dev,
                             struct txx9aclc_dmadata *dmadata)
 {
-       struct txx9aclc_plat_drvdata *drvdata =txx9aclc_drvdata;
+       struct txx9aclc_plat_drvdata *drvdata = txx9aclc_drvdata;
        struct txx9dmac_slave *ds = &dmadata->dma_slave;
        dma_cap_mask_t mask;
 
@@ -392,6 +392,7 @@ static int txx9aclc_pcm_remove(struct snd_soc_platform *platform)
        for (i = 0; i < 2; i++) {
                struct txx9aclc_dmadata *dmadata = &dev->dmadata[i];
                struct dma_chan *chan = dmadata->dma_chan;
+
                if (chan) {
                        dmadata->frag_count = -1;
                        dmaengine_terminate_all(chan);