Re: [PATCH] ASoC: rt5631: Fixing compilation warning when DT is disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Attaching the patch with changes suggested by Uwe. Though there is another patch which I submitted, but I leave it to Mark Brown as to which patch to pick.

Previous patch :
From 80b55f898d0a31b63fd6ed3bd82c548a0559b07b Mon Sep 17 00:00:00 2001
From: Krishna Mohan Dani <krishna.md@xxxxxxxxxxx>
Date: Mon, 17 Nov 2014 19:24:46 +0530
Subject: [PATCH 1/2] ASoC: rt5631: Fixing compilation warning when DT is
disabled

-Krishna

--------------------------------------------------
From: "UweKleine-König" <u.kleine-koenig@xxxxxxxxxxxxxx>
Sent: Monday, November 17, 2014 9:26 PM
To: "Krishna Mohan Dani" <krishna.md@xxxxxxxxxxx>
Cc: <linux-samsung-soc@xxxxxxxxxxxxxxx>; <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>; <alsa-devel@xxxxxxxxxxxxxxxx>; <broonie@xxxxxxxxxx>; <kgene.kim@xxxxxxxxxxx>; "Claude Youn" <claude.youn@xxxxxxxxx> Subject: Re: [PATCH] ASoC: rt5631: Fixing compilation warning when DT is disabled

On Mon, Nov 17, 2014 at 07:26:29PM +0530, Krishna Mohan Dani wrote:
Fixes the following compilation warning:
Warning: 'rt5631_i2c_dt_ids' defined but not used - when DT is not used.

Signed-off-by: Claude Youn <claude.youn@xxxxxxxxx>
Signed-off-by: Krishna Mohan Dani <krishna.md@xxxxxxxxxxx>
---
 sound/soc/codecs/rt5631.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 3b7d5e4..9425545 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1691,12 +1691,14 @@ static const struct i2c_device_id rt5631_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, rt5631_i2c_id);

+#ifdef CONFIG_OF
 static struct of_device_id rt5631_i2c_dt_ids[] = {
 { .compatible = "realtek,rt5631"},
 { .compatible = "realtek,alc5631"},
 { }
 };
 MODULE_DEVICE_TABLE(of, rt5631_i2c_dt_ids);
+#endif

An (IMHO nicer) alternative is:

-static struct of_device_id rt5631_i2c_dt_ids[] = {
+static struct of_device_id rt5631_i2c_dt_ids[] __maybe_unused = {

Best regards
Uwe

--
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Attachment: 0001-ASoC-rt5631-Fixing-compilation-warning-when-DT-is-di.patch
Description: Binary data


[Index of Archives]     [Linux SoC Development]     [Linux Rockchip Development]     [Linux USB Development]     [Video for Linux]     [Linux Audio Users]     [Linux SCSI]     [Yosemite News]

  Powered by Linux