Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f8cde8 authored by Sachin Kamat's avatar Sachin Kamat Committed by David Woodhouse
Browse files

mtd: davinci_nand: Use of_match_ptr() 



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

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 19d69b86

drivers/mtd/nand/davinci_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/slab.h>

#include <linux/of_device.h>

#include <linux/of.h>



#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>
@@ -577,7 +578,6 @@ static struct davinci_nand_pdata 
	return pdev->dev.platform_data;

}

#else

#define davinci_nand_of_match NULL

static struct davinci_nand_pdata

	*nand_davinci_get_pdata(struct platform_device *pdev)

{
@@ -878,7 +878,7 @@ static struct platform_driver nand_davinci_driver = { 
	.driver		= {

		.name	= "davinci_nand",

		.owner	= THIS_MODULE,

		.of_match_table = davinci_nand_of_match,

		.of_match_table = of_match_ptr(davinci_nand_of_match),

	},

};

MODULE_ALIAS("platform:davinci_nand");