From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 18 Aug 2017 06:35:33 +0000 (+0200)
Subject: s390/vmcp: simplify vmcp_response_free()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb304e800d491d5168df61a999beebe8042e7e58;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

s390/vmcp: simplify vmcp_response_free()

Get rid of the goto and "out" label within vmcp_response_free() which
I added. This just makes the code harder to read than necessary.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 0aa50afa5063..7898bbcc28fc 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -90,10 +90,9 @@ static void vmcp_response_free(struct vmcp_session *session)
 		page = phys_to_page((unsigned long)session->response);
 		cma_release(vmcp_cma, page, nr_pages);
 		session->cma_alloc = 0;
-		goto out;
+	} else {
+		free_pages((unsigned long)session->response, order);
 	}
-	free_pages((unsigned long)session->response, order);
-out:
 	session->response = NULL;
 }