From: Sascha Hauer <s.hauer@pengutronix.de>
To: Antony Pavlov <antonynpavlov@gmail.com>
Cc: barebox@lists.infradead.org,
Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: Re: [RFC] ARM: zynq: fix "'IO_SPACE_LIMIT' redefined" warning
Date: Thu, 10 Jan 2019 12:01:39 +0100 [thread overview]
Message-ID: <20190110110139.6k5tkxscqiazgddg@pengutronix.de> (raw)
In-Reply-To: <20190110135519.87505f79ee6e4be71c710cca@gmail.com>
On Thu, Jan 10, 2019 at 01:55:19PM +0300, Antony Pavlov wrote:
> On Thu, 10 Jan 2019 09:38:25 +0100
> Sascha Hauer <s.hauer@pengutronix.de> wrote:
>
> > On Wed, Jan 09, 2019 at 11:27:54PM +0300, Antony Pavlov wrote:
> > > The patch fixes the following compiler's warning:
> > >
> > > In file included from include/common.h:33:0,
> > > from arch/arm/mach-zynq/zynq.c:18:
> > > arch/arm/include/asm/io.h:4:0: warning: "IO_SPACE_LIMIT" redefined
> > > #define IO_SPACE_LIMIT 0
> > >
> > > In file included from
> > > arch/arm/mach-zynq/zynq.c:17:0:
> > > include/asm-generic/io.h:92:0: note: this is the location of the previous definition
> > > #define IO_SPACE_LIMIT 0xffff
> > >
> > > Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > > ---
> > > arch/arm/mach-zynq/zynq.c | 1 -
> > > 1 file changed, 1 deletion(-)
> > >
> > > diff --git a/arch/arm/mach-zynq/zynq.c b/arch/arm/mach-zynq/zynq.c
> > > index a0a8d0d249..dd8f12c16a 100644
> > > --- a/arch/arm/mach-zynq/zynq.c
> > > +++ b/arch/arm/mach-zynq/zynq.c
> > > @@ -14,7 +14,6 @@
> > > */
> > >
> > > #include <asm/system.h>
> > > -#include <asm-generic/io.h>
> >
> > asm-generic/io.h shouldn't be included directly, but only from asm/io.h
> > if it decides to do so. io.h includes asm/io.h, so this is the one that
> > should be included instead.
>
> common.h includes asm/io.h, please see full patch context:
>
> --- a/arch/arm/mach-zynq/zynq.c
> +++ b/arch/arm/mach-zynq/zynq.c
> @@ -14,7 +14,6 @@
> */
>
> #include <asm/system.h>
> -#include <asm-generic/io.h>
> #include <common.h>
> #include <init.h>
> #include <restart.h>
>
>
> The question is, should we just drop this "#include <asm-generic/io.h>" or
> change "#include <asm-generic/io.h>" into "#include <io.h>".
Since this file really uses readl and friends I'd say let's change it to
"#include <io.h>" rather than removing the inclusion.
Sascha
--
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:[~2019-01-10 11:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 20:27 Antony Pavlov
2019-01-09 21:07 ` Sam Ravnborg
2019-01-10 8:38 ` Sascha Hauer
2019-01-10 10:55 ` Antony Pavlov
2019-01-10 11:01 ` 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=20190110110139.6k5tkxscqiazgddg@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=antonynpavlov@gmail.com \
--cc=barebox@lists.infradead.org \
--cc=s.trumtrar@pengutronix.de \
/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