Re: [PATCH v5 4/6] staging: vc04_services: vchiq-mmal: Drop include Makefile directive

[Laurent Pinchart]

Hi Umang,

Thank you for the patch.

On Thu, Jan 19, 2023 at 05:25:01PM +0530, Umang Jain wrote:
> Drop the include directive they can break the build one only wants to
> build a subdirectory. Replace with "../" for the includes, in the
> mmal-vchiq.c instead.
> 
> Suggested-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx>
> ---
>  drivers/staging/vc04_services/vchiq-mmal/Makefile     | 4 ----
>  drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile
> index c7d3b06e17ce..6937f6534c26 100644
> --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile
> +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
> @@ -2,7 +2,3 @@
>  bcm2835-mmal-vchiq-objs := mmal-vchiq.o
>  
>  obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o
> -
> -ccflags-y += \
> -	-I$(srctree)/$(src)/.. \
> -	-I$(srctree)/$(src)/../include

Same comments as for 2/6, although, if we decide to drop 2/6, you could
still remove the first of these two -I entries.

> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> index 6b5879a33780..234e3764db64 100644
> --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> @@ -23,9 +23,9 @@
>  #include <linux/slab.h>
>  #include <linux/completion.h>
>  #include <linux/vmalloc.h>
> -#include <linux/raspberrypi/vchiq.h>
>  #include <media/videobuf2-vmalloc.h>
>  
> +#include "../include/linux/raspberrypi/vchiq.h"
>  #include "mmal-common.h"
>  #include "mmal-vchiq.h"
>  #include "mmal-msg.h"

-- 
Regards,

Laurent Pinchart