| Message ID | 1375846569-9499-1-git-send-email-josh.wu@atmel.com |
|---|---|
| State | Accepted |
| Commit | 9fe5f52c9eb2f2df2b6ffdab0100f4475fef2ba1 |
| Headers | show |
On Wed, 2013-08-07 at 11:36 +0800, Josh Wu wrote: > This patch fix following warning: > > drivers/mtd/nand/atmel_nand.c:2007: warning: 'atmel_nand_nfc_match' defined but not used > > This patch add '#if defined(CONFIG_OF)' block to guard around the definition of > atmel_nand_nfc_match, in order to avoid the warning when kernel is configurated > as non-dt supported. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> Pushed to l2-mtd.git, thanks!
On Wed, 2013-08-07 at 11:36 +0800, Josh Wu wrote: > This patch fix following warning: > > drivers/mtd/nand/atmel_nand.c:2007: warning: 'atmel_nand_nfc_match' defined but not used > > This patch add '#if defined(CONFIG_OF)' block to guard around the definition of > atmel_nand_nfc_match, in order to avoid the warning when kernel is configurated > as non-dt supported. Ick. This driver is littered with CONFIG_OF checks. Yet I've just seen a patch to pxa3xx_nand which *removes* ifdefs, on the basis that all the of_match_ functions/macros will just 'do the right thing'. Can't we do that here too? We might just need to add __maybe_unused? > +#if defined(CONFIG_OF) > static struct of_device_id atmel_nand_nfc_match[] = { > { .compatible = "atmel,sama5d3-nfc" }, > { /* sentinel */ } > }; > +#endif Also, why doesn't this one appear in a MODULE_DEVICE_TABLE() ?
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 65b302c..ddcd575 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -2251,10 +2251,12 @@ static int atmel_nand_nfc_probe(struct platform_device *pdev) return 0; } +#if defined(CONFIG_OF) static struct of_device_id atmel_nand_nfc_match[] = { { .compatible = "atmel,sama5d3-nfc" }, { /* sentinel */ } }; +#endif static struct platform_driver atmel_nand_nfc_driver = { .driver = {
This patch fix following warning: drivers/mtd/nand/atmel_nand.c:2007: warning: 'atmel_nand_nfc_match' defined but not used This patch add '#if defined(CONFIG_OF)' block to guard around the definition of atmel_nand_nfc_match, in order to avoid the warning when kernel is configurated as non-dt supported. Signed-off-by: Josh Wu <josh.wu@atmel.com> --- drivers/mtd/nand/atmel_nand.c | 2 ++ 1 file changed, 2 insertions(+)