| Message ID | 1386426661-24549-1-git-send-email-ezequiel.garcia@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 0d681560176ef94b6b2aaa39e3e935662cffc6e6 |
| Headers | show |
On Sat, Dec 07, 2013 at 11:31:01AM -0300, Ezequiel Garcia wrote: > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > to remove the #ifdef CONFIG_OF. Build tested only. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Looks good. Also build tested with !CONFIG_OF (the relevant case). Pushed to l2-mtd.git. Thanks! Brian
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index a3c84eb..8332a49 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -1021,7 +1021,6 @@ static irqreturn_t flctl_handle_flste(int irq, void *dev_id) return IRQ_HANDLED; } -#ifdef CONFIG_OF struct flctl_soc_config { unsigned long flcmncr_val; unsigned has_hwecc:1; @@ -1080,12 +1079,6 @@ static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) return pdata; } -#else /* CONFIG_OF */ -static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) -{ - return NULL; -} -#endif /* CONFIG_OF */ static int flctl_probe(struct platform_device *pdev) {
Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe to remove the #ifdef CONFIG_OF. Build tested only. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/mtd/nand/sh_flctl.c | 7 ------- 1 file changed, 7 deletions(-)