From 167ad9e2cb758aedaf778e6ba2c631878ff2dd68 Mon Sep 17 00:00:00 2001 From: Sumit Bhattacharya Date: Fri, 20 Apr 2012 15:10:59 +0530 Subject: ASoC: Tegra: Pass snd_soc_card handle in tegra_asoc_utils_init Change prototype of tegra_asoc_utils_init to pass snd_soc_card handle. It is needed to move common tegra machine driver codes to tegra_asoc_utils interface. Bug 968814 Change-Id: I98490ffdda51cf7d0b89adadb23c31892183bc0e Signed-off-by: Sumit Bhattacharya Reviewed-on: http://git-master/r/97914 Reviewed-by: Simone Willett Tested-by: Simone Willett --- sound/soc/tegra/tegra_aic326x.c | 2 +- sound/soc/tegra/tegra_asoc_utils.c | 3 ++- sound/soc/tegra/tegra_asoc_utils.h | 3 ++- sound/soc/tegra/tegra_max98088.c | 2 +- sound/soc/tegra/tegra_max98095.c | 2 +- sound/soc/tegra/tegra_p1852.c | 2 +- sound/soc/tegra/tegra_rt5640.c | 2 +- sound/soc/tegra/tegra_wm8753.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 2 +- sound/soc/tegra/trimslice.c | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) (limited to 'sound') diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c index cffcd44570c6..a5c6fc0aecb7 100644 --- a/sound/soc/tegra/tegra_aic326x.c +++ b/sound/soc/tegra/tegra_aic326x.c @@ -1160,7 +1160,7 @@ static __devinit int tegra_aic326x_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index 0dbbd3fca3e7..b134f0808afa 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -153,11 +153,12 @@ int tegra_asoc_utils_clk_disable(struct tegra_asoc_utils_data *data) EXPORT_SYMBOL_GPL(tegra_asoc_utils_clk_disable); int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, - struct device *dev) + struct device *dev, struct snd_soc_card *card) { int ret; data->dev = dev; + data->card = card; data->clk_pll_p_out1 = clk_get_sys(NULL, "pll_p_out1"); if (IS_ERR(data->clk_pll_p_out1)) { diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h index 1c4e521cb4ba..512df0d54eb1 100644 --- a/sound/soc/tegra/tegra_asoc_utils.h +++ b/sound/soc/tegra/tegra_asoc_utils.h @@ -31,6 +31,7 @@ struct device; struct tegra_asoc_utils_data { struct device *dev; + struct snd_soc_card *card; struct clk *clk_pll_a; struct clk *clk_pll_a_out0; struct clk *clk_cdev1; @@ -47,7 +48,7 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, void tegra_asoc_utils_lock_clk_rate(struct tegra_asoc_utils_data *data, int lock); int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, - struct device *dev); + struct device *dev, struct snd_soc_card *card); void tegra_asoc_utils_fini(struct tegra_asoc_utils_data *data); int tegra_asoc_utils_clk_enable(struct tegra_asoc_utils_data *data); int tegra_asoc_utils_clk_disable(struct tegra_asoc_utils_data *data); diff --git a/sound/soc/tegra/tegra_max98088.c b/sound/soc/tegra/tegra_max98088.c index 7b7ac96da42e..63a067338dc4 100644 --- a/sound/soc/tegra/tegra_max98088.c +++ b/sound/soc/tegra/tegra_max98088.c @@ -1119,7 +1119,7 @@ static __devinit int tegra_max98088_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_max98095.c b/sound/soc/tegra/tegra_max98095.c index 2104ba849cd3..95295ef4151e 100644 --- a/sound/soc/tegra/tegra_max98095.c +++ b/sound/soc/tegra/tegra_max98095.c @@ -630,7 +630,7 @@ static __devinit int tegra_max98095_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_p1852.c b/sound/soc/tegra/tegra_p1852.c index 27a1ea590340..9506a1c842df 100644 --- a/sound/soc/tegra/tegra_p1852.c +++ b/sound/soc/tegra/tegra_p1852.c @@ -201,7 +201,7 @@ static __devinit int tegra_p1852_driver_probe(struct platform_device *pdev) pdata->codec_info[i].name; } - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 291ba4a631e8..e5e6c1f826f0 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -614,7 +614,7 @@ static __devinit int tegra_rt5640_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c index 2e532fcd1e46..795356875ba4 100644 --- a/sound/soc/tegra/tegra_wm8753.c +++ b/sound/soc/tegra/tegra_wm8753.c @@ -872,7 +872,7 @@ static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 55e4f61edfd2..ce608b007bef 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -805,7 +805,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index 8fc07e9adf2e..660479b89478 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c @@ -163,7 +163,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) return -ENOMEM; } - ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev, card); if (ret) goto err_free_trimslice; -- cgit v1.2.3