From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Umang Jain <umang.jain@ideasonboard.com>
Cc: linux-staging@lists.linux.dev,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefan Wahren <stefan.wahren@i2se.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Adrien Thierry <athierry@redhat.com>,
Dan Carpenter <error27@gmail.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
Paul Elder <paul.elder@ideasonboard.com>
Subject: Re: [PATCH v5 5/6] staging: vc04_services: interface: Drop include Makefile directive
Date: Fri, 20 Jan 2023 03:35:38 +0200 [thread overview]
Message-ID: <Y8nv6tZ3PhUYpsKm@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20230119115503.268693-6-umang.jain@ideasonboard.com>
Hi Umang,
Thank you for the patch.
On Thu, Jan 19, 2023 at 05:25:02PM +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
> interface/ files instead.
>
> Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/staging/vc04_services/Makefile | 2 --
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +-
> .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 3 ++-
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
> index 1fd191e2e2a5..44794bdf6173 100644
> --- a/drivers/staging/vc04_services/Makefile
> +++ b/drivers/staging/vc04_services/Makefile
> @@ -15,5 +15,3 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
> obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/
> obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/
>
> -ccflags-y += -I $(srctree)/$(src)/include
> -
Same comment as for 2/6. Personally, I think I'd prefer dropping 2/6,
4/6 and 5/6 until it's time to move vchiq out of staging, at which point
the ccflags-y will just be dropped, without requiring other changes.
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> index 3c198eb1c77a..ec1a3caefaea 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> @@ -10,8 +10,8 @@
> #include <linux/kref.h>
> #include <linux/rcupdate.h>
> #include <linux/wait.h>
> -#include <linux/raspberrypi/vchiq.h>
>
> +#include "../../include/linux/raspberrypi/vchiq.h"
> #include "vchiq_cfg.h"
>
> /* Do this so that we can test-build the code on non-rpi systems */
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> index 96f50beace44..17550831f86c 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> @@ -5,7 +5,8 @@
> #define VCHIQ_IOCTLS_H
>
> #include <linux/ioctl.h>
> -#include <linux/raspberrypi/vchiq.h>
> +
> +#include "../../include/linux/raspberrypi/vchiq.h"
>
> #define VCHIQ_IOC_MAGIC 0xc4
> #define VCHIQ_INVALID_HANDLE (~0)
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2023-01-20 1:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 11:54 [PATCH v5 0/6] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-01-19 11:54 ` [PATCH v5 1/6] staging: vc04_services: Drop __VCCOREVER__ remnants Umang Jain
2023-01-19 12:14 ` Greg Kroah-Hartman
2023-01-20 1:22 ` Laurent Pinchart
2023-01-19 11:54 ` [PATCH v5 2/6] staging: vc04_services: bcm2835-audio: Drop include Makefile directive Umang Jain
2023-01-20 1:28 ` Laurent Pinchart
2023-01-20 6:57 ` Greg Kroah-Hartman
2023-01-19 11:55 ` [PATCH v5 3/6] staging: vc04_services: bcm2835-camera: " Umang Jain
2023-01-20 1:32 ` Laurent Pinchart
2023-01-19 11:55 ` [PATCH v5 4/6] staging: vc04_services: vchiq-mmal: " Umang Jain
2023-01-20 1:33 ` Laurent Pinchart
2023-01-19 11:55 ` [PATCH v5 5/6] staging: vc04_services: interface: " Umang Jain
2023-01-20 1:35 ` Laurent Pinchart [this message]
2023-01-19 11:55 ` [PATCH v5 6/6] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-01-20 1:52 ` Laurent Pinchart
2023-01-20 6:58 ` Greg Kroah-Hartman
2023-01-20 10:56 ` Umang Jain
2023-01-20 15:18 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y8nv6tZ3PhUYpsKm@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=athierry@redhat.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=error27@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=paul.elder@ideasonboard.com \
--cc=stefan.wahren@i2se.com \
--cc=umang.jain@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome