Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c4f8cde8343ace075fb3dae2d5bc796cdfaffbfd

Authored by Sachin Kamat
Committed by David Woodhouse
1 parent 19d69b8600
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mtd: davinci_nand: Use of_match_ptr() 

This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/mtd/nand/davinci_nand.c
Diff comments   View file @ c4f8cde
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/mtd/partitions.h>
35 35 #include <linux/slab.h>
36 36 #include <linux/of_device.h>
  37 +#include <linux/of.h>
37 38  
38 39 #include <linux/platform_data/mtd-davinci.h>
39 40 #include <linux/platform_data/mtd-davinci-aemif.h>
... ... @@ -577,7 +578,6 @@
577 578 return pdev->dev.platform_data;
578 579 }
579 580 #else
580   -#define davinci_nand_of_match NULL
581 581 static struct davinci_nand_pdata
582 582 *nand_davinci_get_pdata(struct platform_device *pdev)
583 583 {
... ... @@ -878,7 +878,7 @@
878 878 .driver = {
879 879 .name = "davinci_nand",
880 880 .owner = THIS_MODULE,
881   - .of_match_table = davinci_nand_of_match,
  881 + .of_match_table = of_match_ptr(davinci_nand_of_match),
882 882 },
883 883 };
884 884 MODULE_ALIAS("platform:davinci_nand");