The vchiq_drvdata structure will be extended in subsequent patches,
to track the vchiq connections (currently tracked by global members).
to the vchiq platform driver. Hence, prepare the struct vchiq_drvdata
by moving it to vchiq_arm.h, so it can be shared across.
No functional changes intended in this patch.
Signed-off-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx>
---
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 ------
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 8 ++++++++
2 files changed, 8 insertions(+), 6 deletions(-)
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 1579bd4e5263..52569517ba4e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -29,7 +29,6 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <soc/bcm2835/raspberrypi-firmware.h>
#include "vchiq_core.h"
#include "vchiq_ioctl.h"
@@ -71,11 +70,6 @@ struct vchiq_state g_state;
static struct vchiq_device *bcm2835_audio;
static struct vchiq_device *bcm2835_camera;
-struct vchiq_drvdata {
- const unsigned int cache_line_size;
- struct rpi_firmware *fw;
-};
-
static struct vchiq_drvdata bcm2835_drvdata = {
.cache_line_size = 32,
};
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index 7844ef765a00..7fef05e7389c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -11,6 +11,9 @@
#include <linux/platform_device.h>
#include <linux/semaphore.h>
#include <linux/atomic.h>
+
+#include <soc/bcm2835/raspberrypi-firmware.h>
+
#include "vchiq_core.h"
#include "vchiq_debugfs.h"
@@ -25,6 +28,11 @@ enum USE_TYPE_E {
USE_TYPE_VCHIQ
};
+struct vchiq_drvdata {
+ const unsigned int cache_line_size;
+ struct rpi_firmware *fw;
+};
+
struct user_service {
struct vchiq_service *service;
void __user *userdata;
--
2.43.0
