These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / ux500 / ux500_msp_dai.c

diff --git a/kernel/sound/soc/ux500/ux500_msp_dai.c b/kernel/sound/soc/ux500/ux500_msp_dai.c
index 978f2d7..6d5698b 100644 (file)
--- a/kernel/sound/soc/ux500/ux500_msp_dai.c
+++ b/kernel/sound/soc/ux500/ux500_msp_dai.c
@@ -522,9 +522,9 @@ static int ux500_msp_dai_hw_params(struct snd_pcm_substream *substream,
                slots_active = hweight32(mask);
                dev_dbg(dai->dev, "TDM-slots active: %d", slots_active);
 
-               snd_pcm_hw_constraint_minmax(runtime,
+               snd_pcm_hw_constraint_single(runtime,
                                SNDRV_PCM_HW_PARAM_CHANNELS,
-                               slots_active, slots_active);
+                               slots_active);
                break;
 
        default:
@@ -773,20 +773,22 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
        }
        prcmu_qos_add_requirement(PRCMU_QOS_APE_OPP, (char *)pdev->name, 50);
 
-       drvdata->pclk = clk_get(&pdev->dev, "apb_pclk");
+       drvdata->pclk = devm_clk_get(&pdev->dev, "apb_pclk");
        if (IS_ERR(drvdata->pclk)) {
                ret = (int)PTR_ERR(drvdata->pclk);
-               dev_err(&pdev->dev, "%s: ERROR: clk_get of pclk failed (%d)!\n",
+               dev_err(&pdev->dev,
+                       "%s: ERROR: devm_clk_get of pclk failed (%d)!\n",
                        __func__, ret);
-               goto err_pclk;
+               return ret;
        }
 
-       drvdata->clk = clk_get(&pdev->dev, NULL);
+       drvdata->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(drvdata->clk)) {
                ret = (int)PTR_ERR(drvdata->clk);
-               dev_err(&pdev->dev, "%s: ERROR: clk_get failed (%d)!\n",
+               dev_err(&pdev->dev,
+                       "%s: ERROR: devm_clk_get failed (%d)!\n",
                        __func__, ret);
-               goto err_clk;
+               return ret;
        }
 
        ret = ux500_msp_i2s_init_msp(pdev, &drvdata->msp,
@@ -795,7 +797,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
                dev_err(&pdev->dev,
                        "%s: ERROR: Failed to init MSP-struct (%d)!",
                        __func__, ret);
-               goto err_init_msp;
+               return ret;
        }
        dev_set_drvdata(&pdev->dev, drvdata);
 
@@ -804,7 +806,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",
                        __func__, drvdata->msp->id);
-               goto err_init_msp;
+               return ret;
        }
 
        ret = ux500_pcm_register_platform(pdev);
@@ -819,13 +821,6 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
 
 err_reg_plat:
        snd_soc_unregister_component(&pdev->dev);
-err_init_msp:
-       clk_put(drvdata->clk);
-err_clk:
-       clk_put(drvdata->pclk);
-err_pclk:
-       devm_regulator_put(drvdata->reg_vape);
-
        return ret;
 }
 
@@ -837,12 +832,8 @@ static int ux500_msp_drv_remove(struct platform_device *pdev)
 
        snd_soc_unregister_component(&pdev->dev);
 
-       devm_regulator_put(drvdata->reg_vape);
        prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s");
 
-       clk_put(drvdata->clk);
-       clk_put(drvdata->pclk);
-
        ux500_msp_i2s_cleanup_msp(pdev, drvdata->msp);
 
        return 0;
@@ -852,6 +843,7 @@ static const struct of_device_id ux500_msp_i2s_match[] = {
        { .compatible = "stericsson,ux500-msp-i2s", },
        {},
 };
+MODULE_DEVICE_TABLE(of, ux500_msp_i2s_match);
 
 static struct platform_driver msp_i2s_driver = {
        .driver = {