From patchwork Mon Mar 20 18:42:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9635183 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CCFF60132 for ; Mon, 20 Mar 2017 18:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22D1F2521E for ; Mon, 20 Mar 2017 18:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17BB22623D; Mon, 20 Mar 2017 18:43:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A08762521E for ; Mon, 20 Mar 2017 18:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932696AbdCTSnF (ORCPT ); Mon, 20 Mar 2017 14:43:05 -0400 Received: from mail.kernel.org ([198.145.29.136]:51872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932523AbdCTSnC (ORCPT ); Mon, 20 Mar 2017 14:43:02 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2866E201BC; Mon, 20 Mar 2017 18:42:55 +0000 (UTC) Received: from localhost (unknown [69.55.156.165]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27D0120295; Mon, 20 Mar 2017 18:42:54 +0000 (UTC) Subject: [PATCH v2 2/4] asm-generic/io.h: Remove unused generic __ioremap() definition From: Bjorn Helgaas To: Arnd Bergmann Cc: linux-arch@vger.kernel.org, linux-pci@vger.kernel.org, "Luis R. Rodriguez" , linux-kernel@vger.kernel.org Date: Mon, 20 Mar 2017 13:42:53 -0500 Message-ID: <20170320184253.4858.12956.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20170320182014.4858.22352.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20170320182014.4858.22352.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Several arches use __ioremap() to help implement the generic ioremap(), ioremap_nocache(), and ioremap_wc() interfaces, but this usage is all inside the arch/ directory. The only __ioremap() uses outside arch/ are in the ZorroII RAM disk driver and some framebuffer drivers that are only buildable on m68k and powerpc, and they use the versions provided by those arches. There's no need for a generic version of __ioremap(), so remove it. Signed-off-by: Bjorn Helgaas Reviewed-by: Arnd Bergmann Acked-by: Geert Uytterhoeven --- include/asm-generic/io.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 978d2e27ce1d..e0a331a22346 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -843,15 +843,6 @@ static inline void __iomem *ioremap(phys_addr_t offset, size_t size) } #endif -#ifndef __ioremap -#define __ioremap __ioremap -static inline void __iomem *__ioremap(phys_addr_t offset, size_t size, - unsigned long flags) -{ - return ioremap(offset, size); -} -#endif - #ifndef ioremap_nocache #define ioremap_nocache ioremap_nocache static inline void __iomem *ioremap_nocache(phys_addr_t offset, size_t size)