From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqoKZ-0007D5-UR for linux-mtd@lists.infradead.org; Wed, 22 Mar 2017 22:02:14 +0000 Date: Wed, 22 Mar 2017 23:01:47 +0100 From: Boris Brezillon To: Thomas Petazzoni Cc: Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , linux-mtd@lists.infradead.org, Linus Walleij , Stefan Roese Subject: Re: [PATCH 13/13] mtd: nand: fsmc: remove CONFIG_OF conditional Message-ID: <20170322230147.397094b4@bbrezillon> In-Reply-To: <1490090645-8576-14-git-send-email-thomas.petazzoni@free-electrons.com> References: <1490090645-8576-1-git-send-email-thomas.petazzoni@free-electrons.com> <1490090645-8576-14-git-send-email-thomas.petazzoni@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, 21 Mar 2017 11:04:05 +0100 Thomas Petazzoni wrote: > Since commit 4404d7d821c33 ("mtd: nand: fsmc: remove stale non-DT probe > path"), the fsmc NAND driver only supports Device Tree probing, and > therefore has a "depends on OF" in its Kconfig option. > > Due to this the #ifdef CONFIG_OF ... #endif condition in the driver code > is no longer necessary. > > Signed-off-by: Thomas Petazzoni > --- > drivers/mtd/nand/fsmc_nand.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c > index c50c3ed5..fbab0bb 100644 > --- a/drivers/mtd/nand/fsmc_nand.c > +++ b/drivers/mtd/nand/fsmc_nand.c > @@ -1157,14 +1157,12 @@ static int fsmc_nand_resume(struct device *dev) > > static SIMPLE_DEV_PM_OPS(fsmc_nand_pm_ops, fsmc_nand_suspend, fsmc_nand_resume); > > -#ifdef CONFIG_OF > static const struct of_device_id fsmc_nand_id_table[] = { > { .compatible = "st,spear600-fsmc-nand" }, > { .compatible = "stericsson,fsmc-nand" }, > {} > }; > MODULE_DEVICE_TABLE(of, fsmc_nand_id_table); > -#endif > > static struct platform_driver fsmc_nand_driver = { > .remove = fsmc_nand_remove, You probably also want to remove of_match_ptr() in .of_match_table = of_match_ptr(fsmc_nand_id_table),