[PATCH v3 03/17] arm64, hibernate: remove gotos in create_safe_exec_page

[Pavel Tatashin]

Usually, gotos are used to handle cleanup after exception, but
in case of create_safe_exec_page there are no clean-ups. So,
simply return the errors directly.

Signed-off-by: Pavel Tatashin <pasha.tatas...@soleen.com>
---
 arch/arm64/kernel/hibernate.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 4bb4d17a6a7c..c8211108ec11 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -198,17 +198,14 @@ static int create_safe_exec_page(void *src_start, size_t 
length,
                                 unsigned long dst_addr,
                                 phys_addr_t *phys_dst_addr)
 {
-       int rc = 0;
        pgd_t *pgdp;
        pud_t *pudp;
        pmd_t *pmdp;
        pte_t *ptep;
        unsigned long dst = get_safe_page(GFP_ATOMIC);
 
-       if (!dst) {
-               rc = -ENOMEM;
-               goto out;
-       }
+       if (!dst)
+               return -ENOMEM;
 
        memcpy((void *)dst, src_start, length);
        __flush_icache_range(dst, dst + length);
@@ -216,30 +213,24 @@ static int create_safe_exec_page(void *src_start, size_t 
length,
        pgdp = pgd_offset_raw((void *)get_safe_page(GFP_ATOMIC), dst_addr);
        if (pgd_none(READ_ONCE(*pgdp))) {
                pudp = (void *)get_safe_page(GFP_ATOMIC);
-               if (!pudp) {
-                       rc = -ENOMEM;
-                       goto out;
-               }
+               if (!pudp)
+                       return -ENOMEM;
                pgd_populate(&init_mm, pgdp, pudp);
        }
 
        pudp = pud_offset(pgdp, dst_addr);
        if (pud_none(READ_ONCE(*pudp))) {
                pmdp = (void *)get_safe_page(GFP_ATOMIC);
-               if (!pmdp) {
-                       rc = -ENOMEM;
-                       goto out;
-               }
+               if (!pmdp)
+                       return -ENOMEM;
                pud_populate(&init_mm, pudp, pmdp);
        }
 
        pmdp = pmd_offset(pudp, dst_addr);
        if (pmd_none(READ_ONCE(*pmdp))) {
                ptep = (void *)get_safe_page(GFP_ATOMIC);
-               if (!ptep) {
-                       rc = -ENOMEM;
-                       goto out;
-               }
+               if (!ptep)
+                       return -ENOMEM;
                pmd_populate_kernel(&init_mm, pmdp, ptep);
        }
 
@@ -265,8 +256,7 @@ static int create_safe_exec_page(void *src_start, size_t 
length,
 
        *phys_dst_addr = virt_to_phys((void *)dst);
 
-out:
-       return rc;
+       return 0;
 }
 
 #define dcache_clean_range(start, end) __flush_dcache_area(start, (end - 
start))
-- 
2.23.0