x86/mm/pat: Simplify the free_memtype() control flow

Simplify/streamline the quirky handling of the pat_pagerange_is_ram() logic,
and get rid of the 'err' local variable.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index ea7da7e..af04992 100644 (file)
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -656,7 +656,6 @@ int reserve_memtype(u64 start, u64 end, enum page_cache_mode req_type,
 
 int free_memtype(u64 start, u64 end)
 {
-       int err = -EINVAL;
        int is_range_ram;
        struct memtype *entry;
 
@@ -671,14 +670,10 @@ int free_memtype(u64 start, u64 end)
                return 0;
 
        is_range_ram = pat_pagerange_is_ram(start, end);
-       if (is_range_ram == 1) {
-
-               err = free_ram_pages_type(start, end);
-
-               return err;
-       } else if (is_range_ram < 0) {
+       if (is_range_ram == 1)
+               return free_ram_pages_type(start, end);
+       if (is_range_ram < 0)
                return -EINVAL;
-       }
 
        spin_lock(&memtype_lock);
        entry = memtype_erase(start, end);