From patchwork Thu Sep 21 11:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13393861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDA8CE70714 for ; Thu, 21 Sep 2023 11:05:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5DD2E6B0248; Thu, 21 Sep 2023 07:05:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58DBE6B0249; Thu, 21 Sep 2023 07:05:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4554A6B024A; Thu, 21 Sep 2023 07:05:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 31DAA6B0248 for ; Thu, 21 Sep 2023 07:05:12 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 09607161072 for ; Thu, 21 Sep 2023 11:05:12 +0000 (UTC) X-FDA: 81260322864.24.12B002F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 2A6A640017 for ; Thu, 21 Sep 2023 11:05:10 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="X1/mkJJ3"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695294310; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+7t/BumSdqz7jYYtXcF1gDq2WFzlnypJrOD9JQD5AH8=; b=Nq5EspDdJrJ4aB7mYP64LhV4jTXbo+w+AtIwr+/Qgv5hRryfZdUyotULAFo5UxI1A95sal IsqRNJuoQpEpk0PG8akTMimqZ9581LFQzd2Yy5w2AmlR1HC7FHjQC+bHOT+oHEJjV+5l9Y a1N7Jhy4T3Kf4DRndGJwpmB2FHHC0gA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="X1/mkJJ3"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695294310; a=rsa-sha256; cv=none; b=4LRV6eO3KZ7YHNy377qRj5WheZWYccNP96AG/T3qCHCK5cx58zvccZMij2gpI3sLTEgY3O 2j9pKuSyfY998E4vn1x8rJH8tbWaMG44n9Lyq9EaSrcWTAePQT8/DMUqnU+bvuiTZPtRrB 8/KGX4eUKZwrOQYRv4D/U6KvA8CvsFU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695294309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+7t/BumSdqz7jYYtXcF1gDq2WFzlnypJrOD9JQD5AH8=; b=X1/mkJJ3p6pfoA4PembOxOmRnwkMmKa9bAGBNq9tXit9i6iM0HsReCFgNvWJvopj8VAjmT F5MdWpxYYHlQq7tqm1NdGy3FprnGPagJ7hKGD98ZZnhNAUkuaajrOLlX4zKSw1MnSpTHSd btTSTEQAC/hF9R8L0F+W6czqK4gch9A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-643-hGsr711MOhCa2r41Gebw6Q-1; Thu, 21 Sep 2023 07:05:04 -0400 X-MC-Unique: hGsr711MOhCa2r41Gebw6Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F25018175A1; Thu, 21 Sep 2023 11:05:03 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A8042156A27; Thu, 21 Sep 2023 11:04:56 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, arnd@arndb.de, jiaxun.yang@flygoat.com, mpe@ellerman.id.au, geert@linux-m68k.org, mcgrof@kernel.org, hch@infradead.org, tsbogend@alpha.franken.de, f.fainelli@gmail.com, deller@gmx.de, Baoquan He , Serge Semin , Huacai Chen , linux-mips@vger.kernel.org Subject: [PATCH v5 4/4] mips: io: remove duplicated codes Date: Thu, 21 Sep 2023 19:04:24 +0800 Message-ID: <20230921110424.215592-5-bhe@redhat.com> In-Reply-To: <20230921110424.215592-1-bhe@redhat.com> References: <20230921110424.215592-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2A6A640017 X-Stat-Signature: 447ckyfcj51xkfiug3fqdkpd4gen98g5 X-HE-Tag: 1695294309-698442 X-HE-Meta: U2FsdGVkX19iAb8Ty9Mnjpp6cyUhzWguq4xPvfGQnEj3SpFvjl05GA/mf0FWTeBz8sQYrqyrm7CEwAXaW9KUUKLKK4Qf0A4zn+SOzB+7VXh4KbGdm1uENBdZY0Qr8DTqfDW9/pYWvB30Gy+/z2f+Ia/sCpeJN/sKRuD89Vy0+mc6F4aosbXMZSXTCrREK2RWVetutkFf3GGi+hVbhjNkCL9totmN9FsRiGKZG2F/TfWujq+zAL0E80ncKAwXehvnOPaaeZtv+PQbPMxyEs6HYly0UZFEZkWPl7T+f8B5/YPB1SIz7UzfCqoMWOyEEbPQnPz9Wf9cQvnoKppEvnUFu07auQFfEfu1DnvWRyAzK/Mq0gjU+XhVDv+xI4W/IgenzNOxfa0hLdVNlzsLImyHtYcFS+7jw7jsWKDUQ0kFfg/ZQ/FKPMBGIxafmbSVMyQWpNx846RTXGrqaMmEX6twFXhK/BmrEIcThvw1XbypRvmozaO2084Y+XfRHGZXhGlPWFXavfF0Hl3AbNloIZpiKt+ND1hs9Oogwjm8FKigPQ3333alFgPsj83BToppjkNyEkOgYK+8Y30zii2EmitkxanFR95RblKU8/ruO92MbGBIeD7tp301M6KZZhN9Jwntr7eyuixRJkiW09XMbh8RA+s7fHb2F/ohTsHeel1hUCVDOOyski4B+b5hXKwtADSWidaQzmc6D0/tH4Xx6Yi3PK5q5L3dEi2hLDaNm8fXiipgVO+As0FWlY6ODJzncPdJHi4Gu9TzH++uDposYmICrOK/buPFHU7vUe+yNeM6dc9M6LMpSkcdvKq/f8deLqQ8ev95GbjYkqPC3cjxdlMZdMJEkIR0zsNXskszSvNkSeKnduLg2LXfexKlmsjVNFmJSvOz0ql/blGs9xZ4URgIb8Oj+oZZlFig8p/KOTxoU99LG4BDKLCwHQHFCSvoXCvFaBCJdSlzwM8jSk/j569 PyRHa2sh BSGPUFA+7PdVr8xP4N5RJiVUyNXjbmFs+rERQybh/ARHjO8GR9lqIJaYLjaFYoKCUXu40SFdCjzV6+VdFaeuviMYRNs5egxt/EHusJ3XVp/jvoZ0h/9irG2lK9D//WrJnwhgt1IKa1sBeHkNqyuCjeE3GgirXD7CMSYSJ4ZqnyTdtl3a4fOaZQQFVsFJtiPYhrVmxp9bvcQf9tj4xIksoKaMwVm8gbqmGJhKldIu0xRU5PR7GwEFh6b8EebE/7XYn7Zn6xUoCn1UStuZyVDNKiT+cl71Hh7k0bTx9veb4HuffDo3YVhV2hIpQiCI1ezkDv3h+7kS1ASdVqJ0HQ69znsqGaUHYU5myc0ej8dRxI+4Pro5iTq1ieNaBBcTO86gU4nv5LNaZo9L1BREIBLeu7RnjjXe63rrT9PS0KH+C2PbN8bOznoDOyLl1kPjzUds5UaOp X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: By adding support, the duplicated phys_to_virt can be removed to use the default version in . Meanwhile move isa_bus_to_virt() down below including to fix the compiling error of missing phys_to_virt definition. Signed-off-by: Baoquan He Cc: Thomas Bogendoerfer Cc: Geert Uytterhoeven Cc: Helge Deller Cc: Serge Semin Cc: Florian Fainelli Cc: Huacai Chen Cc: Jiaxun Yang Cc: linux-mips@vger.kernel.org Acked-by: Arnd Bergmann Acked-by: Thomas Bogendoerfer --- arch/mips/include/asm/io.h | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index 1ecf255efb40..fe5476c1c689 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -117,24 +117,6 @@ static inline phys_addr_t virt_to_phys(const volatile void *x) return __virt_to_phys(x); } -/* - * phys_to_virt - map physical address to virtual - * @address: address to remap - * - * The returned virtual address is a current CPU mapping for - * the memory address given. It is only valid to use this function on - * addresses that have a kernel mapping - * - * This function does not handle bus mappings for DMA transfers. In - * almost all conceivable cases a device driver should not be using - * this function - */ -#define phys_to_virt phys_to_virt -static inline void * phys_to_virt(unsigned long address) -{ - return __va(address); -} - /* * ISA I/O bus memory addresses are 1:1 with the physical address. */ @@ -143,11 +125,6 @@ static inline unsigned long isa_virt_to_bus(volatile void *address) return virt_to_phys(address); } -static inline void *isa_bus_to_virt(unsigned long address) -{ - return phys_to_virt(address); -} - /* * Change "struct page" to physical address. */ @@ -596,4 +573,9 @@ void __ioread64_copy(void *to, const void __iomem *from, size_t count); #include +static inline void *isa_bus_to_virt(unsigned long address) +{ + return phys_to_virt(address); +} + #endif /* _ASM_IO_H */