[PATCH/RFC] ASoC: Drop const from struct snd_soc_dai_link *of_node members

Commit Message

Sylwester Nawrocki/Kernel \(PLT\) /SRPOL/Staff Engineer/Samsung Electronics June 16, 2014, 2:33 p.m. UTC

Dropping the const qualifiers prevents "passing argument 1 of ‘of_node_put’
discards ‘const’ qualifier from pointer target type" type warnings when
compiling the code dropping reference to cpu_of_node, codec_of_node or
platform_of_node with with an of_node_put() function call.

This lets us to avoid casting to struct device_node * or caching variables
internally in drivers just to be able to properly drop a reference to the
OF node on clean up paths.

Signed-off-by: Sylwester Nawrocki <[e-mail]>
---
 include/sound/soc.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--
1.7.9.5

Comments

Mark Brown Aug. 16, 2014, 2:57 p.m. UTC | #1

On Mon, Jun 16, 2014 at 04:33:46PM +0200, Sylwester Nawrocki wrote:
> Dropping the const qualifiers prevents "passing argument 1 of ‘of_node_put’
> discards ‘const’ qualifier from pointer target type" type warnings when
> compiling the code dropping reference to cpu_of_node, codec_of_node or
> platform_of_node with with an of_node_put() function call.

Applied, thanks.

Patch

diff --git a/include/sound/soc.h b/include/sound/soc.h
index ed9e2d7..a8d4b79 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -881,7 +881,7 @@  struct snd_soc_dai_link {
 	 * only for codec to codec links, or systems using device tree.
 	 */
 	const char *cpu_name;
-	const struct device_node *cpu_of_node;
+	struct device_node *cpu_of_node;
 	/*
 	 * You MAY specify the DAI name of the CPU DAI. If this information is
 	 * omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node
@@ -893,7 +893,7 @@  struct snd_soc_dai_link {
 	 * DT/OF node, but not both.
 	 */
 	const char *codec_name;
-	const struct device_node *codec_of_node;
+	struct device_node *codec_of_node;
 	/* You MUST specify the DAI name within the codec */
 	const char *codec_dai_name;
 	/*
@@ -902,7 +902,7 @@  struct snd_soc_dai_link {
 	 * do not need a platform.
 	 */
 	const char *platform_name;
-	const struct device_node *platform_of_node;
+	struct device_node *platform_of_node;
 	int be_id;	/* optional ID for machine driver BE identification */

 	const struct snd_soc_pcm_stream *params;