2012-02-16 16:05:58

by Alessandro Rubini

[permalink] [raw]
Subject: [PATCH] ARM: amba: don't include <asm/sizes.h>

The file uses no SZ_* symbol and some architectures miss sizes.h

Signed-off-by: Alessandro Rubini <[email protected]>
Acked-by: Giancarlo Asnaghi <[email protected]>
---

There a number of files including but not using it. This one
in particular I need under x86 so the fix is trivial.

However, I remember different feelings about sizes.h . Should it die
or should it proliferate to other archs using asm-generic/sizes.h ?


drivers/amba/bus.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 01c2cf4..928f80f 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -18,7 +18,6 @@
#include <linux/amba/bus.h>

#include <asm/irq.h>
-#include <asm/sizes.h>

#define to_amba_driver(d) container_of(d, struct amba_driver, drv)

--
1.7.7.2


2012-02-16 17:25:54

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [PATCH] ARM: amba: don't include <asm/sizes.h>

On Thu, Feb 16, 2012 at 05:05:25PM +0100, Alessandro Rubini wrote:
> The file uses no SZ_* symbol and some architectures miss sizes.h
>
> Signed-off-by: Alessandro Rubini <[email protected]>
> Acked-by: Giancarlo Asnaghi <[email protected]>
> ---
>
> There a number of files including but not using it. This one
> in particular I need under x86 so the fix is trivial.
>
> However, I remember different feelings about sizes.h . Should it die
> or should it proliferate to other archs using asm-generic/sizes.h ?

It would be good to have it included for all architectures.
It really has nothing arch specific in it so it ought to live in
include/linux:

git mv include/asm-generic include/linux
And a fix for the archs that will be broken by this.
A small wrapper in arch/$ARCH/include/asm could do the trick


And speaking of this file I sometime have missed:
#define SZ_1K_BITS 10
#define SZ_2K_BITS 11

Or something similar.

Sam

2012-02-16 18:20:51

by Alessandro Rubini

[permalink] [raw]
Subject: Re: [PATCH] ARM: amba: don't include <asm/sizes.h>

> It would be good to have it included for all architectures.
> It really has nothing arch specific in it so it ought to live in
> include/linux:
>
> git mv include/asm-generic include/linux

Ok. I can do this if it has any chance to be accepted. I find more
and more SZ_4K as I dig into my PCIe-AMBA bridge.

/alessandro

2012-02-16 22:15:20

by Russell King - ARM Linux

[permalink] [raw]
Subject: Re: [PATCH] ARM: amba: don't include <asm/sizes.h>

On Thu, Feb 16, 2012 at 05:05:25PM +0100, Alessandro Rubini wrote:
> The file uses no SZ_* symbol and some architectures miss sizes.h
>
> Signed-off-by: Alessandro Rubini <[email protected]>
> Acked-by: Giancarlo Asnaghi <[email protected]>
> ---
>
> There a number of files including but not using it. This one
> in particular I need under x86 so the fix is trivial.
>
> However, I remember different feelings about sizes.h . Should it die
> or should it proliferate to other archs using asm-generic/sizes.h ?

If you're going to continue with this change, please make sure you
test build Versatile Express, Versatile and Realview to ensure that
this doesn't cause breakage.