diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-22 15:30:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 15:43:25 +0100 |
| commit | 2aa488a6bc6a13d7aed6dbcfa5aab31ec09eaeba (patch) | |
| tree | 02bd6d087978f403ab124fab34e4eff76dbd28c6 /drivers/misc | |
| parent | Merge tag 'davinci-for-v4.10/drivers-2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | linux-2aa488a6bc6a13d7aed6dbcfa5aab31ec09eaeba.tar.xz linux-2aa488a6bc6a13d7aed6dbcfa5aab31ec09eaeba.zip | |
misc: sram: remove useless #ifdef
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/sram.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index b0d4dd9b0586..b33ab8ce47ab 100644 --- a/drivers/misc/sram.c +++ b/drivers/misc/sram.c @@ -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, |