From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghY5m-0002ei-HT for barebox@lists.infradead.org; Thu, 10 Jan 2019 11:01:50 +0000 Date: Thu, 10 Jan 2019 12:01:39 +0100 From: Sascha Hauer Message-ID: <20190110110139.6k5tkxscqiazgddg@pengutronix.de> References: <20190109202754.29784-1-antonynpavlov@gmail.com> <20190110083825.fgez6zfmfwyqafw2@pengutronix.de> <20190110135519.87505f79ee6e4be71c710cca@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190110135519.87505f79ee6e4be71c710cca@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [RFC] ARM: zynq: fix "'IO_SPACE_LIMIT' redefined" warning To: Antony Pavlov Cc: barebox@lists.infradead.org, Steffen Trumtrar On Thu, Jan 10, 2019 at 01:55:19PM +0300, Antony Pavlov wrote: > On Thu, 10 Jan 2019 09:38:25 +0100 > Sascha Hauer 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 > > > Signed-off-by: Antony Pavlov > > > --- > > > 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 > > > -#include > > > > 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 > -#include > #include > #include > #include > > > The question is, should we just drop this "#include " or > change "#include " into "#include ". Since this file really uses readl and friends I'd say let's change it to "#include " 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