summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-11-19 05:22:56 +0100
committerMark Brown <broonie@kernel.org>2015-11-20 19:07:02 +0100
commitc51eb1c66e55bf23af4a10dd6e71c5a82c0e6d81 (patch)
treee7866d3b4e2a425778fddf7d2173f95b60ec7bb4 /sound/soc/sh/rcar
parentASoC: rsnd: remove struct platform_device from probe/remove parameter (diff)
downloadlinux-c51eb1c66e55bf23af4a10dd6e71c5a82c0e6d81.tar.xz
linux-c51eb1c66e55bf23af4a10dd6e71c5a82c0e6d81.zip
ASoC: rsnd: tidyup void* cast for 64bit compiler
64bit compiler indicates this without this patch linux/sound/soc/sh/rcar/core.c: In function 'rsnd_probe': linux/sound/soc/sh/rcar/core.c:1002:16: warning: cast from pointer to\ integer of different size [-Wpointer-to-int-cast] Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar')
-rw-r--r--sound/soc/sh/rcar/core.c2
-rw-r--r--sound/soc/sh/rcar/rsnd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 8dceae4b731a..81a6bdb6848c 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -999,7 +999,7 @@ static int rsnd_probe(struct platform_device *pdev)
}
priv->pdev = pdev;
- priv->flags = (u32)of_id->data;
+ priv->flags = (unsigned long)of_id->data;
spin_lock_init(&priv->lock);
/*
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index ae69670c5c0c..42d2ac5cb0d1 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -379,7 +379,7 @@ struct rsnd_priv {
struct platform_device *pdev;
spinlock_t lock;
- u32 flags;
+ unsigned long flags;
#define RSND_GEN_MASK (0xF << 0)
#define RSND_GEN1 (1 << 0)
#define RSND_GEN2 (2 << 0)