Re: [PATCH v4 09/37] ARM: davinci: make irqs.h a local header

[David Lechner]

On 2/14/19 8:52 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
>
> The existence of irqs.h in mach-davinci/include/mach only makes sense
> without SPARSE_IRQ as it's then expected to define NR_IRQS and is
> included from asm/irq.h. As we now support SPARSE_IRQ, this header can
> be moved to mach-davinci and used as the source of HW interrupt numbers.
>
> While updating the includes in various files - also rearrange the
> headers by directory (linux/asm/mach).
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
> ---

Reviewed-by: David Lechner <david@xxxxxxxxxxxxxx>


> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 8d5be6dd2019..26c123f35350 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -44,10 +44,11 @@
>   #include <asm/mach/arch.h>
>   
>   #include <mach/common.h>
> -#include <mach/irqs.h>
> +

We could leave out the blank line here.

>   #include <mach/serial.h>
>   
>   #include "davinci.h"
> +#include "irqs.h"
>   
>   #define NAND_BLOCK_SIZE		SZ_128K
>   

...

> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index 9d4a58a3113a..1e14e964c34d 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -5,13 +5,13 @@
>   #include <linux/init.h>
>   #include <linux/platform_device.h>
>   #include <linux/dma-mapping.h>

Could put dma-mapping.h before init.h here too.

> -
> +#include <linux/platform_data/usb-davinci.h>
>   #include <linux/usb/musb.h>
>   
>   #include <mach/common.h>
> -#include <mach/irqs.h>
>   #include <mach/cputype.h>
> -#include <linux/platform_data/usb-davinci.h>
> +
> +#include "irqs.h"
>   
>   #define DAVINCI_USB_OTG_BASE	0x01c64000
>