From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Norris Subject: Re: [PATCH] of_mtd: Add no-op stubs to support CONFIG_OF=n Date: Mon, 2 Sep 2013 22:36:58 -0700 Message-ID: <20130903053642.GA364@norris.computersforpeace.net> References: <1378175873-2763-1-git-send-email-ezequiel.garcia@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1378175873-2763-1-git-send-email-ezequiel.garcia@free-electrons.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: Ezequiel Garcia Cc: devicetree@vger.kernel.org, Josh Wu , linux-mtd@lists.infradead.org, David Woodhouse , Artem Bityutskiy List-Id: devicetree@vger.kernel.org On Mon, Sep 02, 2013 at 11:37:53PM -0300, Ezequiel Garcia wrote: > Just like the rest of the subsystems, let's add the required no-op > functions to implement stubs when CONFIG_OF=n. > > This prevents MTD drivers from having ugly ifdefs in their code, > and instead hide the ifdef monster in the header closet (far away > from people's sight). > > Signed-off-by: Ezequiel Garcia > --- > include/linux/of_mtd.h | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h > index ed7f267..66f173e 100644 > --- a/include/linux/of_mtd.h > +++ b/include/linux/of_mtd.h > @@ -14,6 +14,21 @@ > int of_get_nand_ecc_mode(struct device_node *np); > int of_get_nand_bus_width(struct device_node *np); > bool of_get_nand_on_flash_bbt(struct device_node *np); > +#else I would include an extra line on either side of #else. > +static inline int of_get_nand_ecc_mode(struct device_node *np) > +{ > + return -ENOSYS; > +} > + > +static inline int of_get_nand_bus_width(struct device_node *np) > +{ > + return -ENOSYS; > +} > + > +static inline bool of_get_nand_on_flash_bbt(struct device_node *np) > +{ > + return false; > +} > #endif Although we are "hiding" the #ifdef's here in the header, we can still help to make them extra clear; I think the typical style is to include /* CONFIG_OF_MTD */ markers to show which #ifdef/#else/#endif block it belongs to. > > #endif /* __LINUX_OF_MTD_H */ With this trivial changes, I amended your patch and pushed to l2-mtd.git. Thanks! I look forward to the following patches to remove some of the driver #ifdef's. Thanks, Brian ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/