diff --git a/drivers/staging/hievent/hievent_driver.c b/drivers/staging/hievent/hievent_driver.c
index 4bbee4f7764752e85cae6e8a9dfd7a885a675803..d723eae41d148fcce925370c9c1df5a214c66035 100644
--- a/drivers/staging/hievent/hievent_driver.c
+++ b/drivers/staging/hievent/hievent_driver.c
@@ -120,17 +120,13 @@ static int hievent_read_ring_head_buffer(unsigned char * const buffer,
 static ssize_t hievent_read(struct file *file, char __user *user_buf,
 			    size_t count, loff_t *ppos)
 {
-	int rc;
 	size_t retval;
 	struct hievent_entry header;
 
 	(void)file;
 
-	rc = wait_event_interruptible(hievent_dev.wq, (hievent_dev.size > 0));
-	if (rc) {
-		retval = -EINVAL;
-		goto out;
-	}
+	if (wait_event_interruptible(hievent_dev.wq, (hievent_dev.size > 0)))
+		return -EINVAL;
 
 	(void)mutex_lock(&hievent_dev.mtx);
 
diff --git a/drivers/staging/hilog/hilog.c b/drivers/staging/hilog/hilog.c
index aaf5f1f21492724751d49cc5e7535bd4f8ea67cb..11adcd5308497aea7d1f70591b2cc4c5532768ae 100644
--- a/drivers/staging/hilog/hilog.c
+++ b/drivers/staging/hilog/hilog.c
@@ -144,16 +144,12 @@ static int hilog_read_ring_head_buffer(unsigned char *buffer, size_t buf_len)
 static ssize_t hilog_read(struct file *file,
 			  char __user *user_buf, size_t count, loff_t *ppos)
 {
-	int rc;
 	size_t retval;
 	struct hilog_entry header;
 
 	(void)file;
-	rc = wait_event_interruptible(hilog_dev.wq, (hilog_dev.size > 0));
-	if (rc) {
-		retval = -EINVAL;
-		goto out;
-	}
+	if (wait_event_interruptible(hilog_dev.wq, (hilog_dev.size > 0)))
+		return -EINVAL;
 
 	(void)mutex_lock(&hilog_dev.mtx);