Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/oom' and 'asoc/topic...

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 66de90ed30cafb43624ae087a008907257043b64..39c3969ac1c7fc7d6b977fc3d65cb995ba208aee 100644 (file)
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -152,9 +152,9 @@ static inline void pxa_ac97_cold_pxa27x(void)
        gsr_bits = 0;
 
        /* PXA27x Developers Manual section 13.5.2.2.1 */
-       clk_enable(ac97conf_clk);
+       clk_prepare_enable(ac97conf_clk);
        udelay(5);
-       clk_disable(ac97conf_clk);
+       clk_disable_unprepare(ac97conf_clk);
        GCR = GCR_COLD_RST | GCR_WARM_RST;
 }
 #endif
@@ -299,14 +299,14 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
 int pxa2xx_ac97_hw_suspend(void)
 {
        GCR |= GCR_ACLINK_OFF;
-       clk_disable(ac97_clk);
+       clk_disable_unprepare(ac97_clk);
        return 0;
 }
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
 
 int pxa2xx_ac97_hw_resume(void)
 {
-       clk_enable(ac97_clk);
+       clk_prepare_enable(ac97_clk);
        return 0;
 }
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
@@ -368,7 +368,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
                goto err_clk;
        }
 
-       ret = clk_enable(ac97_clk);
+       ret = clk_prepare_enable(ac97_clk);
        if (ret)
                goto err_clk2;
 
@@ -403,7 +403,7 @@ void pxa2xx_ac97_hw_remove(struct platform_device *dev)
                clk_put(ac97conf_clk);
                ac97conf_clk = NULL;
        }
-       clk_disable(ac97_clk);
+       clk_disable_unprepare(ac97_clk);
        clk_put(ac97_clk);
        ac97_clk = NULL;
 }

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 9947a95836794f382b8bf60110c6dee857bde4e2..e6d4ff9fd992015453c93746ec5018901bcdd008 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -664,10 +664,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
 
        cs4270 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs4270_private),
                              GFP_KERNEL);
-       if (!cs4270) {
-               dev_err(&i2c_client->dev, "could not allocate codec\n");
+       if (!cs4270)
                return -ENOMEM;
-       }
 
        /* get the power supply regulators */
        for (i = 0; i < ARRAY_SIZE(supply_names); i++)

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 8658194f50bf7416ca88906a8c034b660c313d4f..0e7b9eb2ba61669021064d76c827f759dd50c644 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1408,10 +1408,8 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
 
        cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l73_private),
                               GFP_KERNEL);
-       if (!cs42l73) {
-               dev_err(&i2c_client->dev, "could not allocate codec\n");
+       if (!cs42l73)
                return -ENOMEM;
-       }
 
        cs42l73->regmap = devm_regmap_init_i2c(i2c_client, &cs42l73_regmap);
        if (IS_ERR(cs42l73->regmap)) {

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 8f4c73d17c8736cbf42de15a280f88cd54b2c1a3..d739f83380a84570ed8d0212feb05305f2218e90 100644 (file)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -843,10 +843,8 @@ static int ldo_regulator_register(struct snd_soc_codec *codec,
 
        ldo = kzalloc(sizeof(struct ldo_regulator), GFP_KERNEL);
 
-       if (!ldo) {
-               dev_err(codec->dev, "failed to allocate ldo_regulator\n");
+       if (!ldo)
                return -ENOMEM;
-       }
 
        ldo->desc.name = kstrdup(dev_name(codec->dev), GFP_KERNEL);
        if (!ldo->desc.name) {

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index a40c4b0196a3cfc42a0ebd464d067e0d379f9daa..fcdf11026afffef47015ea8072469c34b916b739 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -380,10 +380,8 @@ static int sta529_i2c_probe(struct i2c_client *i2c,
                return -EINVAL;
 
        sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
-       if (sta529 == NULL) {
-               dev_err(&i2c->dev, "Can not allocate memory\n");
+       if (!sta529)
                return -ENOMEM;
-       }
 
        sta529->regmap = devm_regmap_init_i2c(i2c, &sta529_regmap);
        if (IS_ERR(sta529->regmap)) {

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5360772bc1add02e30c6d4b5510ef9c0ab9ea06e..f14b551b729e390196059d26812997213fd6f8b3 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1477,10 +1477,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
        u32 value;
 
        aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
-       if (aic3x == NULL) {
-               dev_err(&i2c->dev, "failed to create private data\n");
+       if (!aic3x)
                return -ENOMEM;
-       }
 
        aic3x->regmap = devm_regmap_init_i2c(i2c, &aic3x_regmap);
        if (IS_ERR(aic3x->regmap)) {
@@ -1498,10 +1496,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
        } else if (np) {
                ai3x_setup = devm_kzalloc(&i2c->dev, sizeof(*ai3x_setup),
                                                                GFP_KERNEL);
-               if (ai3x_setup == NULL) {
-                       dev_err(&i2c->dev, "failed to create private data\n");
+               if (!ai3x_setup)
                        return -ENOMEM;
-               }
 
                ret = of_get_named_gpio(np, "gpio-reset", 0);
                if (ret >= 0)

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 8fc5a647453b61c8c7636db58dcd9c182d818a60..6fac9e034c483861dc82b3e0468b9bbb362f562d 100644 (file)
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -381,10 +381,8 @@ static int tpa6130a2_probe(struct i2c_client *client,
        dev = &client->dev;
 
        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
-       if (data == NULL) {
-               dev_err(dev, "Can not allocate memory\n");
+       if (!data)
                return -ENOMEM;
-       }
 
        if (pdata) {
                data->power_gpio = pdata->power_gpio;

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 6ab1570653531ecd1584be24786a0af244de0eb1..cf404505e7d1b01a18681d334c7be857a17530ad 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -2161,10 +2161,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
 
        twl4030 = devm_kzalloc(codec->dev, sizeof(struct twl4030_priv),
                               GFP_KERNEL);
-       if (twl4030 == NULL) {
-               dev_err(codec->dev, "Can not allocate memory\n");
+       if (!twl4030)
                return -ENOMEM;
-       }
        snd_soc_codec_set_drvdata(codec, twl4030);
        /* Set the defaults, and power up the codec */
        twl4030->sysclk = twl4030_audio_get_mclk() / 1000;

diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 4ead0dc02b87428e15e160032e3b9ef8fab6f925..5d8ba779085b559d0a24c37fcfc6542fadfe5a8b 100644 (file)
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -461,10 +461,8 @@ static int wl1273_probe(struct snd_soc_codec *codec)
        }
 
        wl1273 = kzalloc(sizeof(struct wl1273_priv), GFP_KERNEL);
-       if (wl1273 == NULL) {
-               dev_err(codec->dev, "Cannot allocate memory.\n");
+       if (!wl1273)
                return -ENOMEM;
-       }
 
        wl1273->mode = WL1273_MODE_BT;
        wl1273->core = *core;

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 71ce3159a62e73da7fb6c97f5ba7baed06db44c9..982467c1d56a1a1b617886661836a0f3db86a798 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -413,7 +413,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
 
                xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);
                if (!xfer) {
-                       dev_err(codec->dev, "Failed to allocate xfer\n");
                        ret = -ENOMEM;
                        goto abort;
                }
@@ -423,8 +422,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
 
                out = kzalloc(len, GFP_KERNEL | GFP_DMA);
                if (!out) {
-                       dev_err(codec->dev,
-                               "Failed to allocate RX buffer\n");
                        ret = -ENOMEM;
                        goto abort1;
                }
@@ -432,8 +429,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
 
                img = kzalloc(len, GFP_KERNEL | GFP_DMA);
                if (!img) {
-                       dev_err(codec->dev,
-                               "Failed to allocate image buffer\n");
                        ret = -ENOMEM;
                        goto abort1;
                }
@@ -526,14 +521,12 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec)
        /* Copy to local buffer first as vmalloc causes problems for dma */
        img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);
        if (!img) {
-               dev_err(codec->dev, "Failed to allocate image buffer\n");
                ret = -ENOMEM;
                goto abort2;
        }
 
        out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);
        if (!out) {
-               dev_err(codec->dev, "Failed to allocate output buffer\n");
                ret = -ENOMEM;
                goto abort1;
        }
@@ -679,11 +672,8 @@ static int wm0010_boot(struct snd_soc_codec *codec)
                }
 
                img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);
-               if (!img_swap) {
-                       dev_err(codec->dev,
-                               "Failed to allocate image buffer\n");
+               if (!img_swap)
                        goto abort;
-               }
 
                /* We need to re-order for 0010 */
                byte_swap_64((u64 *)&pll_rec, img_swap, len);

diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c
index 6e6b93d4696ed9ec85e6502eb1c1a7cabc0fd63a..8011f75fb6cbd45b5328c9f238a61da1325b080b 100644 (file)
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
@@ -164,7 +164,6 @@ static int wm1250_ev1_pdata(struct i2c_client *i2c)
 
        wm1250 = devm_kzalloc(&i2c->dev, sizeof(*wm1250), GFP_KERNEL);
        if (!wm1250) {
-               dev_err(&i2c->dev, "Unable to allocate private data\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index a4c352cc3464959bc8be67066ae41fe321e698ab..34ef65c52a7d9425e84a6c9ba475f5cfdb664ea9 100644 (file)
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -826,10 +826,8 @@ static int wm2000_i2c_probe(struct i2c_client *i2c,
 
        wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),
                              GFP_KERNEL);
-       if (wm2000 == NULL) {
-               dev_err(&i2c->dev, "Unable to allocate private data\n");
+       if (!wm2000)
                return -ENOMEM;
-       }
 
        mutex_init(&wm2000->lock);
 

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index f7c549949c542203c954cb89b2a1f8552212e98a..e2792980ecf23c56a82d0f40f8f37122f7408a4d 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2013,12 +2013,8 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8904->drc_texts = kmalloc(sizeof(char *)
                                            * pdata->num_drc_cfgs, GFP_KERNEL);
-               if (!wm8904->drc_texts) {
-                       dev_err(codec->dev,
-                               "Failed to allocate %d DRC config texts\n",
-                               pdata->num_drc_cfgs);
+               if (!wm8904->drc_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_drc_cfgs; i++)
                        wm8904->drc_texts[i] = pdata->drc_cfgs[i].name;

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index b2ebb104d8794fb14c289b798f6b7b7a7bbcf588..0dada7f0105e8fd51f6af7888d9a670d08f81c3b 100644 (file)
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -934,12 +934,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8994->mbc_texts = kmalloc(sizeof(char *)
                                            * pdata->num_mbc_cfgs, GFP_KERNEL);
-               if (!wm8994->mbc_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d MBC config texts\n",
-                               pdata->num_mbc_cfgs);
+               if (!wm8994->mbc_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_mbc_cfgs; i++)
                        wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name;
@@ -963,12 +959,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8994->vss_texts = kmalloc(sizeof(char *)
                                            * pdata->num_vss_cfgs, GFP_KERNEL);
-               if (!wm8994->vss_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d VSS config texts\n",
-                               pdata->num_vss_cfgs);
+               if (!wm8994->vss_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_vss_cfgs; i++)
                        wm8994->vss_texts[i] = pdata->vss_cfgs[i].name;
@@ -993,12 +985,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8994->vss_hpf_texts = kmalloc(sizeof(char *)
                                                * pdata->num_vss_hpf_cfgs, GFP_KERNEL);
-               if (!wm8994->vss_hpf_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d VSS HPF config texts\n",
-                               pdata->num_vss_hpf_cfgs);
+               if (!wm8994->vss_hpf_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_vss_hpf_cfgs; i++)
                        wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name;
@@ -1024,12 +1012,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8994->enh_eq_texts = kmalloc(sizeof(char *)
                                                * pdata->num_enh_eq_cfgs, GFP_KERNEL);
-               if (!wm8994->enh_eq_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d enhanced EQ config texts\n",
-                               pdata->num_enh_eq_cfgs);
+               if (!wm8994->enh_eq_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_enh_eq_cfgs; i++)
                        wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name;

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 9719d3ca8e47e90d1a717727be4d4131f9805fd6..39d8df04011616e6f18d4812c4967cae84cf5472 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3296,12 +3296,8 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                /* We need an array of texts for the enum API */
                wm8994->drc_texts = devm_kzalloc(wm8994->hubs.codec->dev,
                            sizeof(char *) * pdata->num_drc_cfgs, GFP_KERNEL);
-               if (!wm8994->drc_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d DRC config texts\n",
-                               pdata->num_drc_cfgs);
+               if (!wm8994->drc_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_drc_cfgs; i++)
                        wm8994->drc_texts[i] = pdata->drc_cfgs[i].name;

diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index 87934171f0637da2c2a307893a641a43b0193e0b..a13f0725611a9be6284678069ca9bafe9a98e66f 100644 (file)
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -613,10 +613,8 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,
        int ret;
 
        wm9090 = devm_kzalloc(&i2c->dev, sizeof(*wm9090), GFP_KERNEL);
-       if (wm9090 == NULL) {
-               dev_err(&i2c->dev, "Can not allocate memory\n");
+       if (!wm9090)
                return -ENOMEM;
-       }
 
        wm9090->regmap = devm_regmap_init_i2c(i2c, &wm9090_regmap);
        if (IS_ERR(wm9090->regmap)) {

diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 916817fe6632f573848f5a7a69bf95aa87072313..374537d5e179c6615ec98e1787536659c4a83ff0 100644 (file)
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -183,10 +183,8 @@ static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg)
                return;
 
        cache = devm_kzalloc(codec->dev, sizeof(*cache), GFP_KERNEL);
-       if (!cache) {
-               dev_err(codec->dev, "Failed to allocate DCS cache entry\n");
+       if (!cache)
                return;
-       }
 
        cache->left = snd_soc_read(codec, WM8993_LEFT_OUTPUT_VOLUME);
        cache->left &= WM8993_HPOUT1L_VOL_MASK;

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 6925d71412159148bf933cc1ca9962617d5e3f48..0f34e28a3d551297b62b2a21fd3ae27044313384 100644 (file)
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -466,7 +466,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
 
        mutex_init(&dmic->mutex);
 
-       dmic->fclk = clk_get(dmic->dev, "fck");
+       dmic->fclk = devm_clk_get(dmic->dev, "fck");
        if (IS_ERR(dmic->fclk)) {
                dev_err(dmic->dev, "cant get fck\n");
                return -ENODEV;
@@ -475,8 +475,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");
        if (!res) {
                dev_err(dmic->dev, "invalid dma memory resource\n");
-               ret = -ENODEV;
-               goto err_put_clk;
+               return -ENODEV;
        }
        dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
 
@@ -484,34 +483,19 @@ static int asoc_dmic_probe(struct platform_device *pdev)
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
        dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(dmic->io_base)) {
-               ret = PTR_ERR(dmic->io_base);
-               goto err_put_clk;
-       }
+       if (IS_ERR(dmic->io_base))
+               return PTR_ERR(dmic->io_base);
 
 
-       ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
-                                        &omap_dmic_dai, 1);
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &omap_dmic_component,
+                                             &omap_dmic_dai, 1);
        if (ret)
-               goto err_put_clk;
+               return ret;
 
        ret = omap_pcm_platform_register(&pdev->dev);
        if (ret)
-               goto err_put_clk;
-
-       return 0;
-
-err_put_clk:
-       clk_put(dmic->fclk);
-       return ret;
-}
-
-static int asoc_dmic_remove(struct platform_device *pdev)
-{
-       struct omap_dmic *dmic = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_component(&pdev->dev);
-       clk_put(dmic->fclk);
+               return ret;
 
        return 0;
 }
@@ -529,7 +513,6 @@ static struct platform_driver asoc_dmic_driver = {
                .of_match_table = omap_dmic_of_match,
        },
        .probe = asoc_dmic_probe,
-       .remove = asoc_dmic_remove,
 };
 
 module_platform_driver(asoc_dmic_driver);

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index efe2cd699b77d5ad6524faeec558bf95c5e74408..bd3ef2a88be0847b1972ab43564017c624fd3089 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -805,8 +805,9 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component,
-                                        &omap_mcbsp_dai, 1);
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &omap_mcbsp_component,
+                                             &omap_mcbsp_dai, 1);
        if (ret)
                return ret;
 
@@ -817,8 +818,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
 {
        struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
 
-       snd_soc_unregister_component(&pdev->dev);
-
        if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                mcbsp->pdata->ops->free(mcbsp->id);
 

diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 8d809f8509c8e8867a0ddfb28e46d423dd71c19e..f4b05bc23e4bfb4d27adf8dea4702539c2696609 100644 (file)
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -31,6 +31,7 @@
 #include <sound/pcm_params.h>
 #include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
+#include <sound/omap-pcm.h>
 
 #ifdef CONFIG_ARCH_OMAP1
 #define pcm_omap1510() cpu_is_omap1510()

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 199a8b3775531c9e0ac559aeac13c848d4409fc1..0109f6c2334e528e757b0f128fbf2dddbd3f29de 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -723,7 +723,8 @@ static int pxa_ssp_probe(struct snd_soc_dai *dai)
                ssp_handle = of_parse_phandle(dev->of_node, "port", 0);
                if (!ssp_handle) {
                        dev_err(dev, "unable to get 'port' phandle\n");
-                       return -ENODEV;
+                       ret = -ENODEV;
+                       goto err_priv;
                }
 
                priv->ssp = pxa_ssp_request_of(ssp_handle, "SoC audio");