summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorStephen Warren2011-07-01 21:56:14 +0200
committerMark Brown2011-07-04 17:49:24 +0200
commitb5f9cfed12dc639cce5a8b6e741352980e05a8a9 (patch)
tree450da526bc2db3ae4aa8b1e29152470c51be907f /sound/soc
parentASoC: core - Make platform probe more like codec probe. (diff)
downloadkernel-qcow2-linux-b5f9cfed12dc639cce5a8b6e741352980e05a8a9.tar.gz
kernel-qcow2-linux-b5f9cfed12dc639cce5a8b6e741352980e05a8a9.tar.xz
kernel-qcow2-linux-b5f9cfed12dc639cce5a8b6e741352980e05a8a9.zip
ASoC: Tegra: I2S: s/clk_get_sys/clk_get/
The clock needed by the I2S driver is associated with the I2S device name in the standard fashion. Hence, use clk_get(dev) instead of clk_get_sys(clk_name). Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/tegra/tegra_i2s.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 6b817e20548c..2e5685512db0 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -348,7 +348,6 @@ struct snd_soc_dai_driver tegra_i2s_dai[] = {
static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
{
struct tegra_i2s * i2s;
- char clk_name[12]; /* tegra-i2s.0 */
struct resource *mem, *memregion, *dmareq;
int ret;
@@ -383,8 +382,7 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
}
dev_set_drvdata(&pdev->dev, i2s);
- snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id);
- i2s->clk_i2s = clk_get_sys(clk_name, NULL);
+ i2s->clk_i2s = clk_get(&pdev->dev, NULL);
if (IS_ERR(i2s->clk_i2s)) {
dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
ret = PTR_ERR(i2s->clk_i2s);