[PATCH] of_mtd: Add no-op stubs to support CONFIG_OF=n

Brian Norris computersforpeace at gmail.com
Tue Sep 3 01:36:58 EDT 2013


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 <ezequiel.garcia at free-electrons.com>
> ---
>  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



More information about the linux-mtd mailing list