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@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> > > > Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx> > > > --- > > > 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
