From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754573AbbDTKN2 (ORCPT ); Mon, 20 Apr 2015 06:13:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34050 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754008AbbDTKNZ (ORCPT ); Mon, 20 Apr 2015 06:13:25 -0400 Date: Mon, 20 Apr 2015 03:13:07 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, pavel@ucw.cz, hpa@zytor.com, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, pavel@ucw.cz, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com In-Reply-To: <20150416080440.GA507@amd> References: <20150416080440.GA507@amd> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mm: Clean up types in xlate_dev_mem_ptr() Git-Commit-ID: 94d4b4765b7ddb8478b0d57663cf7a08e2263bbf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 94d4b4765b7ddb8478b0d57663cf7a08e2263bbf Gitweb: http://git.kernel.org/tip/94d4b4765b7ddb8478b0d57663cf7a08e2263bbf Author: Ingo Molnar AuthorDate: Fri, 23 Nov 2012 19:19:07 +0100 Committer: Ingo Molnar CommitDate: Mon, 20 Apr 2015 08:41:37 +0200 x86/mm: Clean up types in xlate_dev_mem_ptr() Pavel Machek reported the following compiler warning on x86/32 CONFIG_HIGHMEM64G=y builds: arch/x86/mm/ioremap.c:344:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] Clean up the types in this function by using a single natural type for internal calculations (unsigned long), to make it more apparent what's happening, and also to remove fragile casts. Reported-by: Pavel Machek Cc: jgross@suse.com Cc: roland@purestorage.com Link: http://lkml.kernel.org/r/20150416080440.GA507@amd Signed-off-by: Ingo Molnar --- arch/x86/mm/ioremap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index fdf617c..4bf037b 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -332,18 +332,20 @@ EXPORT_SYMBOL(iounmap); */ void *xlate_dev_mem_ptr(phys_addr_t phys) { - void *addr; - unsigned long start = phys & PAGE_MASK; + unsigned long start = phys & PAGE_MASK; + unsigned long offset = phys & ~PAGE_MASK; + unsigned long vaddr; /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */ if (page_is_ram(start >> PAGE_SHIFT)) return __va(phys); - addr = (void __force *)ioremap_cache(start, PAGE_SIZE); - if (addr) - addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); + vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE); + /* Only add the offset on success and return NULL if the ioremap() failed: */ + if (vaddr) + vaddr += offset; - return addr; + return (void *)vaddr; } void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)