Patchwork i2c: at91: fix unsed variable warning when building with !CONFIG_OF

login
register
mail settings
Submitter Joachim Eastwood
Date Feb. 9, 2013, 6:14 p.m.
Message ID <1360433640-30160-1-git-send-email-manabian@gmail.com>
Download mbox | patch
Permalink /patch/219424/
State Accepted
Headers show

Comments

Joachim Eastwood - Feb. 9, 2013, 6:14 p.m.
Commit 70d46a2 "i2c: at91: add dt support to i2c-at91"
added DT only support for at91sam9x5. Building i2c-at91
without CONFIG_OF now warns about at91sam9x5_config as
being unused.

  drivers/i2c/busses/i2c-at91.c:556:30: warning: 'at91sam9x5_config' defined but not used [-Wunused-variable]

Move at91sam9x5_config under the defined(CONFIG_OF)
guard as new AT91 SoCs will be DT only.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
Hi,

This patch is agains 3.8-rc7 since the warning was
introduced in the 3.8 merge cycle.

regards
Joachim Eastwood


 drivers/i2c/busses/i2c-at91.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Wolfram Sang - Feb. 10, 2013, 6:41 p.m.
On Sat, Feb 09, 2013 at 07:14:00PM +0100, Joachim Eastwood wrote:
> Commit 70d46a2 "i2c: at91: add dt support to i2c-at91"
> added DT only support for at91sam9x5. Building i2c-at91
> without CONFIG_OF now warns about at91sam9x5_config as
> being unused.
> 
>   drivers/i2c/busses/i2c-at91.c:556:30: warning: 'at91sam9x5_config' defined but not used [-Wunused-variable]
> 
> Move at91sam9x5_config under the defined(CONFIG_OF)
> guard as new AT91 SoCs will be DT only.
> 
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>

Applied to for-next, thanks.

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 2bfc04d..708026b 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -553,13 +553,6 @@  static struct at91_twi_pdata at91sam9g10_config = {
 	.has_dma_support = false,
 };
 
-static struct at91_twi_pdata at91sam9x5_config = {
-	.clk_max_div = 7,
-	.clk_offset = 4,
-	.has_unre_flag = false,
-	.has_dma_support = true,
-};
-
 static const struct platform_device_id at91_twi_devtypes[] = {
 	{
 		.name = "i2c-at91rm9200",
@@ -582,6 +575,13 @@  static const struct platform_device_id at91_twi_devtypes[] = {
 };
 
 #if defined(CONFIG_OF)
+static struct at91_twi_pdata at91sam9x5_config = {
+	.clk_max_div = 7,
+	.clk_offset = 4,
+	.has_unre_flag = false,
+	.has_dma_support = true,
+};
+
 static const struct of_device_id atmel_twi_dt_ids[] = {
 	{
 		.compatible = "atmel,at91sam9260-i2c",