Message ID | 20200919080403.17520-1-jmkrzyszt@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | mtd: rawnand: ams-delta: Fix non-OF build warning | expand |
On Sat, 2020-09-19 at 08:04:03 UTC, Janusz Krzysztofik wrote: > Commit 7c2f66a960fc ("mtd: rawnand: ams-delta: Add module device > tables") introduced an OF module device table but wrapped a reference > to it with of_match_ptr() which resolves to NULL in non-OF configs. > That resulted in a clang compiler warning on unused variable in non-OF > builds. Fix it. > > drivers/mtd/nand/raw/ams-delta.c:373:34: warning: unused variable 'gpio_nand_of_id_table' [-Wunused-const-variable] > static const struct of_device_id gpio_nand_of_id_table[] = { > ^ > 1 warning generated. > > Fixes: 7c2f66a960fc ("mtd: rawnand: ams-delta: Add module device tables") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index fdba155416d2..0bf4cfc25147 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -400,12 +400,14 @@ static int gpio_nand_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF static const struct of_device_id gpio_nand_of_id_table[] = { { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, gpio_nand_of_id_table); +#endif static const struct platform_device_id gpio_nand_plat_id_table[] = { {
Commit 7c2f66a960fc ("mtd: rawnand: ams-delta: Add module device tables") introduced an OF module device table but wrapped a reference to it with of_match_ptr() which resolves to NULL in non-OF configs. That resulted in a clang compiler warning on unused variable in non-OF builds. Fix it. drivers/mtd/nand/raw/ams-delta.c:373:34: warning: unused variable 'gpio_nand_of_id_table' [-Wunused-const-variable] static const struct of_device_id gpio_nand_of_id_table[] = { ^ 1 warning generated. Fixes: 7c2f66a960fc ("mtd: rawnand: ams-delta: Add module device tables") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- drivers/mtd/nand/raw/ams-delta.c | 2 ++ 1 file changed, 2 insertions(+)