]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
misc: sram: remove useless #ifdef
authorArnd Bergmann <arnd@arndb.de>
Tue, 22 Nov 2016 14:30:54 +0000 (15:30 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 14:43:25 +0000 (15:43 +0100)
A recent patch added a new function that is now unused whenever
CONFIG_OF is disabled:

drivers/misc/sram.c:342:12: error: 'atmel_securam_wait' defined but not used [-Werror=unused-function]

There is actually no reason for the #ifdef, because the driver
currently cannot be used in a meaningful way without CONFIG_OF,
and there is no compile-time dependency.

Removing that #ifdef and the respective of_match_ptr() avoids the
warning and simplifies the driver slightly.

Fixes: 2ae2e28852f2 ("misc: sram: add Atmel securam support")
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/misc/sram.c

index b0d4dd9b058645d79a4c025ca59e1a2c63b7e11c..b33ab8ce47ab7c3d9732f8e39b85bbc93c81d770 100644 (file)
@@ -353,13 +353,11 @@ static int atmel_securam_wait(void)
                                        10000, 500000);
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id sram_dt_ids[] = {
        { .compatible = "mmio-sram" },
        { .compatible = "atmel,sama5d2-securam", .data = atmel_securam_wait },
        {}
 };
-#endif
 
 static int sram_probe(struct platform_device *pdev)
 {
@@ -443,7 +441,7 @@ static int sram_remove(struct platform_device *pdev)
 static struct platform_driver sram_driver = {
        .driver = {
                .name = "sram",
-               .of_match_table = of_match_ptr(sram_dt_ids),
+               .of_match_table = sram_dt_ids,
        },
        .probe = sram_probe,
        .remove = sram_remove,