Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4017882ybg; Tue, 29 Oct 2019 00:31:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtGfuSX4vn5Hcy/BcQd8PGmK+D4wYL1j49pe9A9hx2zgfndqHaoGd4CMiHeL4rHy/IH90m X-Received: by 2002:a17:906:4ec9:: with SMTP id i9mr1826568ejv.8.1572334292442; Tue, 29 Oct 2019 00:31:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572334292; cv=none; d=google.com; s=arc-20160816; b=yt3NnyZxD5KGqniaaHy5IprV3sxaJB/I5SISK5ydA7sVS08TYSkmglgYMfyze91G2I qsBWDWn8WB5gGk9x2/+l/4KKALNXD/uOIVfIGQUvylojG6+yo8UaQxeThvPAi9HBjQqa cG6KGO68b5rapH/PHqIOEozTm9nbVSxEGnvKVKwJu+ZfwoA08csrJ7OTlfbSoBUfnz8l 4impQegUKFMTtcXVHXZfePNjLzF2aV7MtjLdDIdNKE5hGGADpe30SNnCIWK/IbhDwjWS rSryjPRtA2g/MI8wO228cbDeubeKMTwFsIoi2rQw+J2kkY719SlcJ7AVaaYE3BNL3SAK mJaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QUtbLuIok0WzaA85KbMW98QwwqyFlzMBqi7pB6SmDJs=; b=nEpxFDhp+w5fyzgHfp+EExXj4aCE+e0A59yrjt1irZYOixxJvV3y7eWCv1Blray7xe 0rKct0Y6zXA/ajsNA1J2S7VDkyUuAiepzs1JkiRqoQQfQML29Vfo7oiXeajjHB0LWDEf kqeqJLi6rYTlnahUh+eaEkWpHhlQHUHtJ6P+fI85BjMfSCUHJ/6yFpheuiyqCgOF4aPB qpmx6fLk84lpyQ4vazYr9f3PcvD/lV5mG4YtPCA21jLMMv/5EniQt8I2VILisAEY4p5O 1rKxEuAGZfkLz2eQ0rdDpKHraoq06U3A7GAusVgOwWWbi8EUPS8JIqOAnSTlA0HRRuS1 XQIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=czHwZLKu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y17si9064359edd.148.2019.10.29.00.31.09; Tue, 29 Oct 2019 00:31:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=czHwZLKu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387522AbfJ2Gt6 (ORCPT + 99 others); Tue, 29 Oct 2019 02:49:58 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:39896 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387497AbfJ2Gt5 (ORCPT ); Tue, 29 Oct 2019 02:49:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QUtbLuIok0WzaA85KbMW98QwwqyFlzMBqi7pB6SmDJs=; b=czHwZLKuFJIPpbN3TBLzvwDue+ DzHq8hMWsN/t3+FaZLnuCp/pDbMkFOj5t0JDzvpIJ8HEf60zOkFV+dMcnnea0P6KwqmV0mn3zcpmS iUiqZB8ejoOWDSoIXmC5aj+Xw3s4AtO0ylaY9QYrq6n05UPVsRJ7pujLDoUZ0WJGX3+QLdZz4bwPQ SkbD7uQdpIvvPvvJQ9QLIeFVX7qu5UAKi/h4WJnyVynvV6mbUl81wb4IuirgJVmKiFfoDEJbiQcjO UIhgDYy4AfHu1OaDM6Hg1BYTB+4uGsmnXvE0cC3ujBgsPpaeOeKF2cfOP6PaC/h3f1MvF5y84AEzR +tg8602w==; Received: from [2001:4bb8:18c:c7d:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1iPLJz-0004FI-Vm; Tue, 29 Oct 2019 06:49:40 +0000 From: Christoph Hellwig To: Arnd Bergmann , Guo Ren , Michal Simek , Greentime Hu , Vincent Chen , Guan Xuetao , x86@kernel.org Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-mtd@lists.infradead.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 20/21] csky: remove ioremap_cache Date: Tue, 29 Oct 2019 07:48:33 +0100 Message-Id: <20191029064834.23438-21-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191029064834.23438-1-hch@lst.de> References: <20191029064834.23438-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No driver that can be used on csky uses ioremap_cache, and this interface has been deprecated in favor of memremap. Signed-off-by: Christoph Hellwig Acked-by: Guo Ren --- arch/csky/include/asm/io.h | 2 -- arch/csky/mm/ioremap.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h index a4b9fb616faa..f572605d5ad5 100644 --- a/arch/csky/include/asm/io.h +++ b/arch/csky/include/asm/io.h @@ -36,13 +36,11 @@ /* * I/O memory mapping functions. */ -extern void __iomem *ioremap_cache(phys_addr_t addr, size_t size); extern void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot); extern void iounmap(void *addr); #define ioremap(addr, size) __ioremap((addr), (size), pgprot_noncached(PAGE_KERNEL)) #define ioremap_wc(addr, size) __ioremap((addr), (size), pgprot_writecombine(PAGE_KERNEL)) -#define ioremap_cache ioremap_cache #include diff --git a/arch/csky/mm/ioremap.c b/arch/csky/mm/ioremap.c index e13cd3497628..ae78256a56fd 100644 --- a/arch/csky/mm/ioremap.c +++ b/arch/csky/mm/ioremap.c @@ -44,13 +44,6 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) } EXPORT_SYMBOL(__ioremap); -void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size) -{ - return __ioremap_caller(phys_addr, size, PAGE_KERNEL, - __builtin_return_address(0)); -} -EXPORT_SYMBOL(ioremap_cache); - void iounmap(void __iomem *addr) { vunmap((void *)((unsigned long)addr & PAGE_MASK)); -- 2.20.1