| Message ID | 1363255624-20885-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Commit | 19d69b86007e6ede34c08f0b5635d1aaba6a46b7 |
| Headers | show |
On Thu, 2013-03-14 at 15:37 +0530, Sachin Kamat wrote: > This eliminates having an #ifdef returning NULL for the case > when OF is disabled. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Pushed all to l2-mtd.git, thanks!
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 945c9f76..28779b6 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,
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- drivers/mtd/devices/mtd_dataflash.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)