From patchwork Wed Aug 2 18:48:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13338751 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A55AC04E69 for ; Wed, 2 Aug 2023 18:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232080AbjHBStO (ORCPT ); Wed, 2 Aug 2023 14:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231897AbjHBStN (ORCPT ); Wed, 2 Aug 2023 14:49:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15AFF1734; Wed, 2 Aug 2023 11:49:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F0FD61AFB; Wed, 2 Aug 2023 18:49:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84374C433CB; Wed, 2 Aug 2023 18:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691002149; bh=WYKfkfr7MebQWbq9faERXzPtA07lKx6EmcLFTn6CB2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cn+VZaY8lMvlmlTfVKNePJotkfJKqjUlKZcWScSemSjw/30kG7ayyX4xn54AyicAK woCQXOz72VOsNW7LZXdIpQZf3iQlV5/sKexruF+XUqNRDZjQ5TAvEGrVKmPl3dN07t y+cslHEo0B4HsmB61mp5uk5dmGBfk7iMsV6VuBs46T//rxlbNAdyGJbItW2ZdBXMF/ pnvhXtz8tgrL7ClXGkeSkrpUBIK9uLBs//D7eSoZR3ioOPdO0rsSrdiWD0TorMYp0O QHIWq/f8J2+Rr/1N4pqDe+baG/Ml/QyMRMF/vkjLNPe//JDctKB3QCD8IckxW+9StM rNhw1qVpB9eGQ== From: Arnd Bergmann To: John Paul Adrian Glaubitz Cc: linux-sh@vger.kernel.org, Rich Felker , Yoshinori Sato , Geert Uytterhoeven , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4/4] sh: machvec: remove custom ioport_{un,}map() Date: Wed, 2 Aug 2023 20:48:49 +0200 Message-Id: <20230802184849.1019466-4-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802184849.1019466-1-arnd@kernel.org> References: <20230802184849.1019466-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Arnd Bergmann These functions were only used on the microdev board that is now gone, so remove them to simplify the ioport handling. This could be further simplified to use the generic I/O port accessors now. Signed-off-by: Arnd Bergmann Reviewed-by: John Paul Adrian Glaubitz --- arch/sh/include/asm/io.h | 4 ++-- arch/sh/include/asm/machvec.h | 5 ----- arch/sh/kernel/ioport.c | 13 +------------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index f2f38e9d489ac..ac521f287fa59 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -181,7 +181,7 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \ { \ volatile type *__addr; \ \ - __addr = __ioport_map(port, sizeof(type)); \ + __addr = (void __iomem *)sh_io_port_base + port; \ *__addr = val; \ slow; \ } \ @@ -191,7 +191,7 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ volatile type *__addr; \ type __val; \ \ - __addr = __ioport_map(port, sizeof(type)); \ + __addr = (void __iomem *)sh_io_port_base + port; \ __val = *__addr; \ slow; \ \ diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index 2b4b085e8f219..4e5314b921f19 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h @@ -19,11 +19,6 @@ struct sh_machine_vector { int (*mv_irq_demux)(int irq); void (*mv_init_irq)(void); -#ifdef CONFIG_HAS_IOPORT_MAP - void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); - void (*mv_ioport_unmap)(void __iomem *); -#endif - int (*mv_clk_init)(void); int (*mv_mode_pins)(void); diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c index f39446a658bdb..c8aff8a20164d 100644 --- a/arch/sh/kernel/ioport.c +++ b/arch/sh/kernel/ioport.c @@ -12,15 +12,6 @@ unsigned long sh_io_port_base __read_mostly = -1; EXPORT_SYMBOL(sh_io_port_base); -void __iomem *__ioport_map(unsigned long addr, unsigned int size) -{ - if (sh_mv.mv_ioport_map) - return sh_mv.mv_ioport_map(addr, size); - - return (void __iomem *)(addr + sh_io_port_base); -} -EXPORT_SYMBOL(__ioport_map); - void __iomem *ioport_map(unsigned long port, unsigned int nr) { void __iomem *ret; @@ -29,13 +20,11 @@ void __iomem *ioport_map(unsigned long port, unsigned int nr) if (ret) return ret; - return __ioport_map(port, nr); + return (void __iomem *)(port + sh_io_port_base); } EXPORT_SYMBOL(ioport_map); void ioport_unmap(void __iomem *addr) { - if (sh_mv.mv_ioport_unmap) - sh_mv.mv_ioport_unmap(addr); } EXPORT_SYMBOL(ioport_unmap);