summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-14 15:37:00 +0530
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-04-05 13:19:51 +0100
commit19d69b86007e6ede34c08f0b5635d1aaba6a46b7 (patch)
tree4af64b248e4170fe737d0e69486c565119e8bca9 /drivers/mtd
parentdcf8abfcb0816adfb9bb175cbea00d7a1a2cae69 (diff)
downloadlinux-stable-19d69b86007e6ede34c08f0b5635d1aaba6a46b7.tar.gz
linux-stable-19d69b86007e6ede34c08f0b5635d1aaba6a46b7.tar.bz2
linux-stable-19d69b86007e6ede34c08f0b5635d1aaba6a46b7.zip
mtd: dataflash: Use of_match_ptr() macro
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>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 945c9f762349..28779b6dfcd9 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -105,8 +105,6 @@ static const struct of_device_id dataflash_dt_ids[] = {
{ .compatible = "atmel,dataflash", },
{ /* sentinel */ }
};
-#else
-#define dataflash_dt_ids NULL
#endif
/* ......................................................................... */
@@ -914,7 +912,7 @@ static struct spi_driver dataflash_driver = {
.driver = {
.name = "mtd_dataflash",
.owner = THIS_MODULE,
- .of_match_table = dataflash_dt_ids,
+ .of_match_table = of_match_ptr(dataflash_dt_ids),
},
.probe = dataflash_probe,