diff --git a/drivers/virt/haven/hh_rm_core.c b/drivers/virt/haven/hh_rm_core.c
index 157513a1b1ff..c4246b6ca3f6 100644
--- a/drivers/virt/haven/hh_rm_core.c
+++ b/drivers/virt/haven/hh_rm_core.c
@@ -132,73 +132,36 @@ int hh_rm_unregister_notifier(struct notifier_block *nb)
 }
 EXPORT_SYMBOL(hh_rm_unregister_notifier);
 
-static struct hh_rm_connection *
-hh_rm_wait_for_notif_fragments(void *recv_buff, size_t recv_buff_size)
+static int hh_rm_process_notif(void *msg, size_t msg_size)
 {
-	struct hh_rm_rpc_hdr *hdr = recv_buff;
+	struct hh_rm_rpc_hdr *hdr = msg;
 	struct hh_rm_connection *connection;
+	u32 notification;
 	size_t payload_size;
+	void *payload;
 	int ret = 0;
 
-	connection = hh_rm_alloc_connection(hdr->msg_id);
-	if (IS_ERR_OR_NULL(connection))
-		return connection;
-
-	payload_size = recv_buff_size - sizeof(*hdr);
-	curr_connection = connection;
-
-	ret = hh_rm_init_connection_buff(connection, recv_buff,
-					sizeof(*hdr), payload_size);
-	if (ret < 0)
-		goto out;
-
-	if (wait_for_completion_interruptible(&connection->seq_done)) {
-		ret = -ERESTARTSYS;
-		goto out;
-	}
-
-	return connection;
-
-out:
-	kfree(connection);
-	return ERR_PTR(ret);
-}
-
-static int hh_rm_process_notif(void *recv_buff, size_t recv_buff_size)
-{
-	struct hh_rm_connection *connection = NULL;
-	struct hh_rm_rpc_hdr *hdr = recv_buff;
-	u32 notification = hdr->msg_id;
-	void *payload = NULL;
-	size_t payload_size;
-	int ret = 0;
-
-	pr_debug("Notification received from RM-VM: %x\n", notification);
-
 	if (curr_connection) {
 		pr_err("Received new notification from RM-VM before completing last connection\n");
 		return -EINVAL;
 	}
 
-	if (recv_buff_size > sizeof(*hdr))
-		payload = recv_buff + sizeof(*hdr);
+	connection = hh_rm_alloc_connection(hdr->msg_id);
+	if (!connection)
+		return -EINVAL;
 
-	/* If the notification payload is split-up into
-	 * fragments, wait until all them arrive.
-	 */
-	if (hdr->fragments) {
-		connection = hh_rm_wait_for_notif_fragments(recv_buff,
-								recv_buff_size);
-		if (IS_ERR_OR_NULL(connection))
-			return PTR_ERR(connection);
-
-		/* In the case of fragments, the complete payload
-		 * is contained under connection->recv_buff
-		 */
-		payload = connection->recv_buff;
-		recv_buff_size = connection->recv_buff_size;
+	if (hh_rm_init_connection_buff(connection, msg, sizeof(*hdr), msg_size - sizeof(*hdr))) {
+		kfree(connection);
+		return -EINVAL;
 	}
-	payload_size = recv_buff_size - sizeof(*hdr);
+
+	if (hdr->fragments)
+		return PTR_ERR(connection);
+
+	payload = connection->recv_buff;
+	payload_size = connection->recv_buff_size;
+	notification = connection->msg_id;
+	pr_debug("Notification received from RM-VM: %x\n", notification);
 
 	switch (notification) {
 	case HH_RM_NOTIF_VM_STATUS:
@@ -297,7 +260,7 @@ static int hh_rm_process_notif(void *recv_buff, size_t recv_buff_size)
 
 err:
 	if (connection) {
-		kfree(connection->recv_buff);
+		kfree(payload);
 		kfree(connection);
 	}