OSDN Git Service

i2c: at91: fix unsed variable warning when building with !CONFIG_OF
authorJoachim Eastwood <manabian@gmail.com>
Sat, 9 Feb 2013 18:14:00 +0000 (19:14 +0100)
committerWolfram Sang <wolfram@the-dreams.de>
Sun, 10 Feb 2013 18:55:26 +0000 (19:55 +0100)
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>
Signed-off-by: Wolfram Sang <wolfram@the-dreams.de>
drivers/i2c/busses/i2c-at91.c

index 3e287d8..3e4ad68 100644 (file)
@@ -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,at91rm9200-i2c",