[50/50] staging: vchiq: Move vchiq.h into include directory

Message ID	20200623164235.29566-51-nsaenzjulienne@suse.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=C9iy=AE=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57DDA20780 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: gregkh@linuxfoundation.org Subject: [PATCH 50/50] staging: vchiq: Move vchiq.h into include directory Date: Tue, 23 Jun 2020 18:42:36 +0200 Message-Id: <20200623164235.29566-51-nsaenzjulienne@suse.de> In-Reply-To: <20200623164235.29566-1-nsaenzjulienne@suse.de> References: <20200623164235.29566-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 summary: Content analysis details: (-4.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [195.135.220.15 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [195.135.220.15 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Precedence: list Cc: devel@driverdev.osuosl.org, kernel-list@raspberrypi.com, linux-kernel@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, laurent.pinchart@ideasonboard.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
Series	staging: vchiq: Getting rid of the vchi/vchiq split \| expand [00/50] staging: vchiq: Getting rid of the vchi/vchiq split [01/50] staging: bcm2835: Break MMAL support out from camera [02/50] staging: mmal-vchiq: Allocate and free components as required [03/50] staging: mmal-vchiq: Avoid use of bool in structures [04/50] staging: mmal-vchiq: Make timeout a defined parameter [05/50] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters [06/50] staging: mmal-vchiq: Fixup vchiq-mmal include ordering [07/50] staging: mmal-vchiq: Fix client_component for 64 bit kernel [08/50] staging: mmal-vchiq: Always return the param size from param_get [09/50] staging: mmal-vchiq: If the VPU returns an error, don't negate it [10/50] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h [11/50] staging: vchiq_arm: Add a matching unregister call [12/50] staging: vchi: Get rid of all useless callback reasons [13/50] staging: vchi: Get rid of vchi_msg_peek() [14/50] staging: vchi: Get rid of struct vchi_instance_handle [15/50] staging: vchi: Unify struct shim_service and struct vchi_service_handle [16/50] staging: vc04_services: bcm2835-audio: Use vchi_msg_hold() [17/50] staging: vchi: Get rid of vchi_msg_dequeue() [18/50] staging: vchi_common: Get rid of all unused definitions [19/50] staging: vchi: Get rid of unnecessary defines [20/50] staging: vc04_services: Get rid of vchi_cfg.h [21/50] staging: vchi: Get rid of flags argument in vchi_msg_hold() [22/50] staging: vchi: Use enum vchiq_bulk_mode instead of vchi's transmission flags [23/50] staging: vchi: Use vchiq's enum vchiq_reason [24/50] staging: vchi: Get rid of effect less expression [25/50] staging: vchiq: Introduce vchiq_validate_params() [26/50] staging: vchiq: Move message queue into struct vchiq_service [27/50] staging: vchiq: Get rid of vchiq_util.h [28/50] staging: vchi: Expose struct vchi_service [29/50] staging: vchiq: Export vchiq_get_service_userdata() [30/50] staging: vchiq: Export vchiq_msg_queue_push [31/50] staging: vchi: Get rid of vchiq_shim's message callback [32/50] staging: vchiq: Don't use a typedef for vchiq_callback [33/50] staging: vchi: Use struct vchiq_service_params [34/50] staging: vchi: Get rid of struct vchi_service [35/50] staging: vchiq: Pass vchiq's message when holding a message [36/50] staging: vchi: Rework vchi_msg_hold() to match vchiq_msg_hold() [37/50] staging: vchiq: Unify fourcc definition mechanisms [38/50] staging: vchi: Get rid of struct vchiq_instance forward declaration [39/50] staging: vchi: Don't include vchiq_core.h [40/50] staging: vchiq: Get rid of unnecessary definitions in vchiq_if.h [41/50] staging: vchiq: Make vchiq_add_service() local [42/50] staging: vchiq: Move definitions only used by core into core header [43/50] staging: vchi: Get rid of vchi_bulk_queue_receive() [44/50] staging: vchi: Get rid of vchi_bulk_queue_transmit() [45/50] staging: vchi: Move vchi_queue_kernel_message() into vchiq [46/50] staging: vchiq: Get rid of vchi [47/50] staging: vchiq: Move conditional barrier definition into vchiq_core.h [48/50] staging: vchiq: Use vchiq.h as the main header file for services [49/50] staging: vchiq: Move defines into core header [50/50] staging: vchiq: Move vchiq.h into include directory

Message ID

20200623164235.29566-51-nsaenzjulienne@suse.de (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57DDA20780
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org
Subject: [PATCH 50/50] staging: vchiq: Move vchiq.h into include directory
Date: Tue, 23 Jun 2020 18:42:36 +0200
Message-Id: <20200623164235.29566-51-nsaenzjulienne@suse.de>
In-Reply-To: <20200623164235.29566-1-nsaenzjulienne@suse.de>
References: <20200623164235.29566-1-nsaenzjulienne@suse.de>
MIME-Version: 1.0
Precedence: list
Cc: devel@driverdev.osuosl.org, kernel-list@raspberrypi.com,
 linux-kernel@vger.kernel.org,
 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
 laurent.pinchart@ideasonboard.com, linux-arm-kernel@lists.infradead.org,
 linux-rpi-kernel@lists.infradead.org
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: 
 linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Series

staging: vchiq: Getting rid of the vchi/vchiq split | expand

Commit Message

Nicolas Saenz Julienne June 23, 2020, 4:42 p.m. UTC

To make the separation clear between vchiq's header files and vchiq.h,
which is to be used by services and is the 'public' API, move it into a
dedicated includes directory.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
 drivers/staging/vc04_services/Makefile                        | 2 +-
 drivers/staging/vc04_services/bcm2835-audio/Makefile          | 2 +-
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.h         | 2 +-
 .../vchiq_arm => include/linux/raspberrypi}/vchiq.h           | 0
 .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h    | 2 +-
 .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h   | 2 +-
 drivers/staging/vc04_services/vchiq-mmal/Makefile             | 1 +
 drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c         | 4 ++--
 8 files changed, 8 insertions(+), 7 deletions(-)
 rename drivers/staging/vc04_services/{interface/vchiq_arm => include/linux/raspberrypi}/vchiq.h (100%)

Comments

Nicolas Saenz Julienne June 25, 2020, 8:24 a.m. UTC | #1

> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile
> b/drivers/staging/vc04_services/vchiq-mmal/Makefile
> index f8164c33aec3..b2a830f48acc 100644
> --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile
> +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
> @@ -5,4 +5,5 @@ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o
>  
>  ccflags-y += \
>  	-I$(srctree)/$(src)/.. \
> +	-I$(srctree)/$(src)/../include \
>  	-D__VCCOREVER__=0x04000000
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> index 72afa4319bd3..b99b7555a8fb 100644
> --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> @@ -23,14 +23,14 @@
>  #include <linux/slab.h>
>  #include <linux/completion.h>
>  #include <linux/vmalloc.h>
> +#include <linux/raspberrypi/vchiq.h>
>  #include <media/videobuf2-vmalloc.h>
> +#include <linux/raspberrypi/vchiq.h>

Just realised that there an include too many here...

Regards,
Nicolas

diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index e02a9c2abf77..7546d70116a0 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -12,5 +12,5 @@  obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
 obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
 obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
 
-ccflags-y += -D__VCCOREVER__=0x04000000
+ccflags-y += -I $(srctree)/$(src)/include  -D__VCCOREVER__=0x04000000
 
diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile
index 13fa6d7d9745..d59fe4dde615 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile
@@ -2,4 +2,4 @@ 
 obj-$(CONFIG_SND_BCM2835)	+= snd-bcm2835.o
 snd-bcm2835-objs		:= bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o
 
-ccflags-y += -I $(srctree)/$(src)/.. -D__VCCOREVER__=0x04000000
+ccflags-y += -I $(srctree)/$(src)/../include -D__VCCOREVER__=0x04000000
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index ca220f5230ec..1b36475872d6 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -6,10 +6,10 @@ 
 
 #include <linux/device.h>
 #include <linux/wait.h>
+#include <linux/raspberrypi/vchiq.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm-indirect.h>
-#include "interface/vchiq_arm/vchiq.h"
 
 #define MAX_SUBSTREAMS   (8)
 #define AVAIL_SUBSTREAMS_MASK  (0xff)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
rename to drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
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 8a27f3d7217e..e67692879249 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -10,10 +10,10 @@ 
 #include <linux/kref.h>
 #include <linux/rcupdate.h>
 #include <linux/wait.h>
+#include <linux/raspberrypi/vchiq.h>
 
 #include "vchiq_cfg.h"
 
-#include "vchiq.h"
 
 /* Do this so that we can test-build the code on non-rpi systems */
 #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
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 f285d754ad28..3653fd99d8a1 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,7 @@ 
 #define VCHIQ_IOCTLS_H
 
 #include <linux/ioctl.h>
-#include "vchiq.h"
+#include <linux/raspberrypi/vchiq.h>
 
 #define VCHIQ_IOC_MAGIC 0xc4
 #define VCHIQ_INVALID_HANDLE (~0)
diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile
index f8164c33aec3..b2a830f48acc 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/Makefile
+++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
@@ -5,4 +5,5 @@  obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o
 
 ccflags-y += \
 	-I$(srctree)/$(src)/.. \
+	-I$(srctree)/$(src)/../include \
 	-D__VCCOREVER__=0x04000000
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 72afa4319bd3..b99b7555a8fb 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -23,14 +23,14 @@ 
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/vmalloc.h>
+#include <linux/raspberrypi/vchiq.h>
 #include <media/videobuf2-vmalloc.h>
+#include <linux/raspberrypi/vchiq.h>
 
 #include "mmal-common.h"
 #include "mmal-vchiq.h"
 #include "mmal-msg.h"
 
-#include "interface/vchiq_arm/vchiq.h"
-
 /*
  * maximum number of components supported.
  * This matches the maximum permitted by default on the VPU

[50/50] staging: vchiq: Move vchiq.h into include directory

Commit Message

Comments

Patch