From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: i.MX6 Phytec phyFLEX: Fix imx6_bbu_nand_register_handler prototype
Date: Wed, 12 Nov 2014 07:30:04 +0100 [thread overview]
Message-ID: <20141112063003.GC30369@pengutronix.de> (raw)
In-Reply-To: <1415742184-21334-1-git-send-email-andrew.smirnov@gmail.com>
On Tue, Nov 11, 2014 at 01:43:04PM -0800, Andrey Smirnov wrote:
> imx6_bbu_nand_register_handler is dependent on
> CONFIG_BAREBOX_UPDATE_IMX6_NAND. Change the protoype definition such
> that said function is stubbed-out when CONFIG_BAREBOX_UPDATE_IMX6_NAND
> is not defined.
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Applied, thanks
Sascha
> ---
> arch/arm/mach-imx/include/mach/bbu.h | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
> index 74c334a..5eb9a47 100644
> --- a/arch/arm/mach-imx/include/mach/bbu.h
> +++ b/arch/arm/mach-imx/include/mach/bbu.h
> @@ -27,8 +27,6 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
> int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
> unsigned long flags);
>
> -int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
> -
> int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
> unsigned long flags);
>
> @@ -70,13 +68,17 @@ static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, c
> return -ENOSYS;
> }
>
> -static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
> +static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
> + unsigned long flags)
> {
> return -ENOSYS;
> }
> +#endif
>
> -static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
> - unsigned long flags)
> +#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND)
> +int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
> +#else
> +static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
> {
> return -ENOSYS;
> }
> --
> 1.9.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2014-11-12 6:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 21:43 Andrey Smirnov
2014-11-12 6:30 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141112063003.GC30369@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox