The following commit has been merged into the x86/mm branch of tip: Commit-ID: 47553d42c55f7b85e72ce6f3a18030102f8f93a3 Gitweb: https://git.kernel.org/tip/47553d42c55f7b85e72ce6f3a18030102f8f93a3 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Tue, 19 Nov 2019 10:18:56 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 10 Dec 2019 10:12:55 +01:00 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@xxxxxxxxxx> --- arch/x86/mm/pat.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index ea7da7e..af04992 100644 --- 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);