From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754372AbdGXKZF (ORCPT ); Mon, 24 Jul 2017 06:25:05 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36249 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751413AbdGXKYn (ORCPT ); Mon, 24 Jul 2017 06:24:43 -0400 Date: Mon, 24 Jul 2017 03:20:57 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, mingo@kernel.org, peterz@infradead.org, baolin.wang@spreadtrum.com, torvalds@linux-foundation.org, mika.westerberg@linux.intel.com, hpa@zytor.com Reply-To: hpa@zytor.com, mika.westerberg@linux.intel.com, baolin.wang@spreadtrum.com, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, andriy.shevchenko@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <20170630170934.83028-5-andriy.shevchenko@linux.intel.com> References: <20170630170934.83028-5-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/io: Remove xlate_dev_kmem_ptr() duplication Git-Commit-ID: eabc2a7c49c01fc97ff8c764ef7d74276b904af6 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: eabc2a7c49c01fc97ff8c764ef7d74276b904af6 Gitweb: http://git.kernel.org/tip/eabc2a7c49c01fc97ff8c764ef7d74276b904af6 Author: Andy Shevchenko AuthorDate: Fri, 30 Jun 2017 20:09:33 +0300 Committer: Ingo Molnar CommitDate: Mon, 24 Jul 2017 11:18:21 +0200 x86/io: Remove xlate_dev_kmem_ptr() duplication Generic header defines xlate_dev_kmem_ptr(). Reuse it from generic header and remove in x86 code. Move a description to the generic header as well. Signed-off-by: Andy Shevchenko Cc: Baolin Wang Cc: Linus Torvalds Cc: Mika Westerberg Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: intel-gfx@lists.freedesktop.org Cc: linux-i2c@vger.kernel.org Cc: wsa@the-dreams.de Link: http://lkml.kernel.org/r/20170630170934.83028-5-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/io.h | 5 ----- include/asm-generic/io.h | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 252434b..b3bba2f 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -216,11 +216,6 @@ extern void set_iounmap_nonlazy(void); #include /* - * Convert a virtual cached pointer to an uncached pointer - */ -#define xlate_dev_kmem_ptr(p) p - -/* * ISA space is 'always mapped' on a typical x86 system, no need to * explicitly ioremap() it. The fact that the ISA IO space is mapped * to PAGE_OFFSET is pure coincidence - it does not mean ISA values diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 395afc8..b4531e3 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -915,6 +915,9 @@ extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ #endif /* CONFIG_HAS_IOPORT_MAP */ +/* + * Convert a virtual cached pointer to an uncached pointer + */ #ifndef xlate_dev_kmem_ptr #define xlate_dev_kmem_ptr xlate_dev_kmem_ptr static inline void *xlate_dev_kmem_ptr(void *addr)