Commit 460165c6 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Get rid of vchiq_util.h 



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

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-25-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77b3f6c4

drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/compat.h>

#include <linux/dma-mapping.h>

#include <linux/rcupdate.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <soc/bcm2835/raspberrypi-firmware.h>



#include "vchiq_core.h"

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+9 −0
Original line number Diff line number Diff line 
// 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"

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE