[27/50] staging: vchiq: Get rid of vchiq_util.h

Message ID	20200623164235.29566-28-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 268AC206EB From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: gregkh@linuxfoundation.org Subject: [PATCH 27/50] staging: vchiq: Get rid of vchiq_util.h Date: Tue, 23 Jun 2020 18:42:13 +0200 Message-Id: <20200623164235.29566-28-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: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [195.135.220.15 listed in wl.mailspike.net] -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-28-nsaenzjulienne@suse.de (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 268AC206EB
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org
Subject: [PATCH 27/50] staging: vchiq: Get rid of vchiq_util.h
Date: Tue, 23 Jun 2020 18:42:13 +0200
Message-Id: <20200623164235.29566-28-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

The header file only provides other includes. Move the relevant includes
to their respective C files and delete it for good.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
 .../vc04_services/interface/vchiq_arm/vchiq.h |  1 -
 .../interface/vchiq_arm/vchiq_2835_arm.c      |  1 +
 .../interface/vchiq_arm/vchiq_arm.c           |  1 +
 .../interface/vchiq_arm/vchiq_core.c          |  9 +++++++
 .../interface/vchiq_arm/vchiq_shim.c          |  4 +--
 .../interface/vchiq_arm/vchiq_util.h          | 27 -------------------
 6 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
index 25af99a0f394..211b20705e36 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
@@ -5,7 +5,6 @@ 
 #define VCHIQ_VCHIQ_H
 
 #include "vchiq_if.h"
-#include "vchiq_util.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_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 38a13e4618a8..1caa2a269c0e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -12,6 +12,7 @@ 
 #include <linux/uaccess.h>
 #include <linux/mm.h>
 #include <linux/of.h>
+#include <linux/slab.h>
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
 #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 355590f1e130..96c6205368ab 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -23,6 +23,7 @@ 
 #include <linux/compat.h>
 #include <linux/dma-mapping.h>
 #include <linux/rcupdate.h>
+#include <linux/delay.h>
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
 #include "vchiq_core.h"
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 0e9680904e68..5b55d32e62a0 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1,8 +1,17 @@ 
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
 
+#include <linux/types.h>
+#include <linux/completion.h>
+#include <linux/mutex.h>
+#include <linux/bitops.h>
+#include <linux/kthread.h>
+#include <linux/wait.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/kref.h>
 #include <linux/rcupdate.h>
+#include <linux/sched/signal.h>
 
 #include "vchiq_core.h"
 
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index 85d79d0033bf..9728667adbd9 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -2,14 +2,14 @@ 
 /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
 
 #include "vchiq_if.h"
 #include "../vchi/vchi.h"
 #include "vchiq.h"
 #include "vchiq_core.h"
 
-#include "vchiq_util.h"
-
 struct vchi_service {
 	unsigned int handle;
 
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h
deleted file mode 100644
index dcf081079c39..000000000000
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h
+++ /dev/null
@@ -1,27 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */
-
-#ifndef VCHIQ_UTIL_H
-#define VCHIQ_UTIL_H
-
-#include <linux/types.h>
-#include <linux/completion.h>
-#include <linux/mutex.h>
-#include <linux/bitops.h>
-#include <linux/kthread.h>
-#include <linux/wait.h>
-#include <linux/vmalloc.h>
-#include <linux/jiffies.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/interrupt.h>
-#include <linux/random.h>
-#include <linux/sched/signal.h>
-#include <linux/ctype.h>
-#include <linux/uaccess.h>
-#include <linux/time.h>  /* for time_t */
-#include <linux/slab.h>
-
-#include "vchiq_if.h"
-
-#endif

[27/50] staging: vchiq: Get rid of vchiq_util.h

Commit Message

Patch