[PATCH] scripts/imx-usb-loader: Drop duplicate definition of ALIGN

[PATCH] scripts/imx-usb-loader: Drop duplicate definition of ALIGN

[Uwe Kleine-König]

This fixes:

	scripts/imx/imx-usb-loader.c:42: warning: "ALIGN" redefined
	 #define ALIGN(x, a)        (((x) + (a) - 1) & ~((a) - 1))

	In file included from scripts/imx/imx-usb-loader.c:35:
	scripts/include/linux/kernel.h:10: note: this is the location of the previous definition
	 #define ALIGN(x, a)  __ALIGN_MASK(x, (typeof(x))(a) - 1)

Fixes: a876d16e6ad3 ("scripts: define ALIGN(x) in scripts' <linux/kernel.h>")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/imx/imx-usb-loader.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 28f342633d43..e277d290352e 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -39,8 +39,6 @@
 
 #define get_min(a, b) (((a) < (b)) ? (a) : (b))
 
-#define ALIGN(x, a)        (((x) + (a) - 1) & ~((a) - 1))
-
 #define FT_APP	0xaa
 #define FT_CSF	0xcc
 #define FT_DCD	0xee
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] scripts/imx-usb-loader: Drop duplicate definition of ALIGN

[Sascha Hauer]

On Tue, Sep 15, 2020 at 11:45:40AM +0200, Uwe Kleine-König wrote:
> This fixes:
> 
> 	scripts/imx/imx-usb-loader.c:42: warning: "ALIGN" redefined
> 	 #define ALIGN(x, a)        (((x) + (a) - 1) & ~((a) - 1))
> 
> 	In file included from scripts/imx/imx-usb-loader.c:35:
> 	scripts/include/linux/kernel.h:10: note: this is the location of the previous definition
> 	 #define ALIGN(x, a)  __ALIGN_MASK(x, (typeof(x))(a) - 1)
> 
> Fixes: a876d16e6ad3 ("scripts: define ALIGN(x) in scripts' <linux/kernel.h>")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  scripts/imx/imx-usb-loader.c | 2 --
>  1 file changed, 2 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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