diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-05-23 02:25:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-26 09:34:54 -0400 |
commit | 9f464f8e076e6fcc8d249e76d84f4fb99c1fecff (patch) | |
tree | c0268b91ad4a93f55e706ad3759062b57e4efc74 /sound | |
parent | f451e48d8e1cae07d55b4a5b558c008cd4dc9a73 (diff) |
ASoC: rsnd: save platform_device instead of device
DT DMA support needs struct platform_device pointer,
and it can get struct device pointer from platform_device.
Save platform_device instead of device.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/rcar/core.c | 2 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 1f6981a56354..073a29354c85 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -957,7 +957,7 @@ static int rsnd_probe(struct platform_device *pdev) | |||
957 | return -ENODEV; | 957 | return -ENODEV; |
958 | } | 958 | } |
959 | 959 | ||
960 | priv->dev = dev; | 960 | priv->pdev = pdev; |
961 | priv->info = info; | 961 | priv->info = info; |
962 | spin_lock_init(&priv->lock); | 962 | spin_lock_init(&priv->lock); |
963 | 963 | ||
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 5aa790170b01..344f9415e669 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -317,7 +317,7 @@ struct rsnd_of_data { | |||
317 | 317 | ||
318 | struct rsnd_priv { | 318 | struct rsnd_priv { |
319 | 319 | ||
320 | struct device *dev; | 320 | struct platform_device *pdev; |
321 | struct rcar_snd_info *info; | 321 | struct rcar_snd_info *info; |
322 | spinlock_t lock; | 322 | spinlock_t lock; |
323 | 323 | ||
@@ -357,7 +357,8 @@ struct rsnd_priv { | |||
357 | int rdai_nr; | 357 | int rdai_nr; |
358 | }; | 358 | }; |
359 | 359 | ||
360 | #define rsnd_priv_to_dev(priv) ((priv)->dev) | 360 | #define rsnd_priv_to_pdev(priv) ((priv)->pdev) |
361 | #define rsnd_priv_to_dev(priv) (&(rsnd_priv_to_pdev(priv)->dev)) | ||
361 | #define rsnd_priv_to_info(priv) ((priv)->info) | 362 | #define rsnd_priv_to_info(priv) ((priv)->info) |
362 | #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) | 363 | #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) |
363 | #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) | 364 | #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) |