| From 92e03fb9e8f73b2729d23c433924608148699f89 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 22 May 2014 23:25:30 -0700 |
| Subject: 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> |
| (cherry picked from commit 9f464f8e076e6fcc8d249e76d84f4fb99c1fecff) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 2 +- |
| sound/soc/sh/rcar/rsnd.h | 5 +++-- |
| 2 files changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -955,7 +955,7 @@ static int rsnd_probe(struct platform_de |
| return -ENODEV; |
| } |
| |
| - priv->dev = dev; |
| + priv->pdev = pdev; |
| priv->info = info; |
| spin_lock_init(&priv->lock); |
| |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -317,7 +317,7 @@ struct rsnd_of_data { |
| |
| struct rsnd_priv { |
| |
| - struct device *dev; |
| + struct platform_device *pdev; |
| struct rcar_snd_info *info; |
| spinlock_t lock; |
| |
| @@ -357,7 +357,8 @@ struct rsnd_priv { |
| int rdai_nr; |
| }; |
| |
| -#define rsnd_priv_to_dev(priv) ((priv)->dev) |
| +#define rsnd_priv_to_pdev(priv) ((priv)->pdev) |
| +#define rsnd_priv_to_dev(priv) (&(rsnd_priv_to_pdev(priv)->dev)) |
| #define rsnd_priv_to_info(priv) ((priv)->info) |
| #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) |
| #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) |