121 lines
3.4 KiB
Diff
121 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hao Li <hao.l.li@intel.com>
|
|
Date: Fri, 31 Aug 2018 10:58:59 +0800
|
|
Subject: [PATCH] VBS-K: fix compilation warnings in VBS-K reference driver
|
|
|
|
Change-Id: I0e67e625145082d7e2a9a44f744de015855aa7ce
|
|
Tracked-On: 218445
|
|
Signed-off-by: Hao Li <hao.l.li@intel.com>
|
|
Reviewed-on:
|
|
---
|
|
drivers/vbs/vbs_rng.c | 50 +++++++++++++++++++++++--------------------
|
|
1 file changed, 27 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/drivers/vbs/vbs_rng.c b/drivers/vbs/vbs_rng.c
|
|
index cdfed63bb1ad..88f6108ca2e8 100644
|
|
--- a/drivers/vbs/vbs_rng.c
|
|
+++ b/drivers/vbs/vbs_rng.c
|
|
@@ -124,15 +124,17 @@ static int vbs_rng_connection_cnt = 0;
|
|
/* function declarations */
|
|
static int handle_kick(int client_id, int req_cnt);
|
|
static void vbs_rng_reset(struct vbs_rng *rng);
|
|
-static void vbs_rng_disable_vq(struct vbs_rng *rng,
|
|
- struct virtio_vq_info *vq);
|
|
+static void vbs_rng_stop(struct vbs_rng *rng);
|
|
+static void vbs_rng_flush(struct vbs_rng *rng);
|
|
+#ifdef RUNTIME_CTRL
|
|
static int vbs_rng_enable_vq(struct vbs_rng *rng,
|
|
struct virtio_vq_info *vq);
|
|
+static void vbs_rng_disable_vq(struct vbs_rng *rng,
|
|
+ struct virtio_vq_info *vq);
|
|
static void vbs_rng_stop_vq(struct vbs_rng *rng,
|
|
struct virtio_vq_info *vq);
|
|
-static void vbs_rng_stop(struct vbs_rng *rng);
|
|
static void vbs_rng_flush_vq(struct vbs_rng *rng, int index);
|
|
-static void vbs_rng_flush(struct vbs_rng *rng);
|
|
+#endif
|
|
|
|
/* hash table related functions */
|
|
static void vbs_rng_hash_init(void)
|
|
@@ -347,17 +349,6 @@ static int vbs_rng_release(struct inode *inode, struct file *f)
|
|
return 0;
|
|
}
|
|
|
|
-static struct hwrng get_hwrng(struct vbs_rng *rng)
|
|
-{
|
|
- return rng->hwrng;
|
|
-}
|
|
-
|
|
-/* Set feature bits in kernel side device */
|
|
-static int vbs_rng_set_features(struct vbs_rng *rng, u64 features)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-
|
|
static long vbs_rng_ioctl(struct file *f, unsigned int ioctl,
|
|
unsigned long arg)
|
|
{
|
|
@@ -424,11 +415,17 @@ static void vbs_rng_reset(struct vbs_rng *rng)
|
|
}
|
|
|
|
/* device specific function */
|
|
-static void vbs_rng_disable_vq(struct vbs_rng *rng,
|
|
- struct virtio_vq_info *vq)
|
|
+static void vbs_rng_stop(struct vbs_rng *rng)
|
|
+{
|
|
+ virtio_dev_deregister(&rng->dev);
|
|
+}
|
|
+
|
|
+/* device specific function */
|
|
+static void vbs_rng_flush(struct vbs_rng *rng)
|
|
{
|
|
}
|
|
|
|
+#ifdef RUNTIME_CTRL
|
|
/* device specific function */
|
|
static int vbs_rng_enable_vq(struct vbs_rng *rng,
|
|
struct virtio_vq_info *vq)
|
|
@@ -437,15 +434,15 @@ static int vbs_rng_enable_vq(struct vbs_rng *rng,
|
|
}
|
|
|
|
/* device specific function */
|
|
-static void vbs_rng_stop_vq(struct vbs_rng *rng,
|
|
- struct virtio_vq_info *vq)
|
|
+static void vbs_rng_disable_vq(struct vbs_rng *rng,
|
|
+ struct virtio_vq_info *vq)
|
|
{
|
|
}
|
|
|
|
/* device specific function */
|
|
-static void vbs_rng_stop(struct vbs_rng *rng)
|
|
+static void vbs_rng_stop_vq(struct vbs_rng *rng,
|
|
+ struct virtio_vq_info *vq)
|
|
{
|
|
- virtio_dev_deregister(&rng->dev);
|
|
}
|
|
|
|
/* device specific function */
|
|
@@ -453,10 +450,17 @@ static void vbs_rng_flush_vq(struct vbs_rng *rng, int index)
|
|
{
|
|
}
|
|
|
|
-/* device specific function */
|
|
-static void vbs_rng_flush(struct vbs_rng *rng)
|
|
+static struct hwrng get_hwrng(struct vbs_rng *rng)
|
|
{
|
|
+ return rng->hwrng;
|
|
+}
|
|
+
|
|
+/* Set feature bits in kernel side device */
|
|
+static int vbs_rng_set_features(struct vbs_rng *rng, u64 features)
|
|
+{
|
|
+ return 0;
|
|
}
|
|
+#endif
|
|
|
|
static const struct file_operations vbs_rng_fops = {
|
|
.owner = THIS_MODULE,
|
|
--
|
|
https://clearlinux.org
|
|
|