From patchwork Fri Oct 21 19:36:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 13015338 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 259F6C38A2D for ; Fri, 21 Oct 2022 19:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229587AbiJUThU (ORCPT ); Fri, 21 Oct 2022 15:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbiJUThS (ORCPT ); Fri, 21 Oct 2022 15:37:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8462A2610A1; Fri, 21 Oct 2022 12:37:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DBDD2B82D21; Fri, 21 Oct 2022 19:37:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE1DC433C1; Fri, 21 Oct 2022 19:37:14 +0000 (UTC) From: Bjorn Helgaas Date: Fri, 21 Oct 2022 14:36:56 -0500 Subject: [PATCH v2 2/4] sh: remove unused __BUILD_IOPORT_SINGLE 'pfx' parameter MIME-Version: 1.0 Message-Id: <20221021-wip-bjorn-22-10-slow-down-io-v2-2-8b3692d12ea7@google.com> References: <20221021-wip-bjorn-22-10-slow-down-io-v2-0-8b3692d12ea7@google.com> In-Reply-To: <20221021-wip-bjorn-22-10-slow-down-io-v2-0-8b3692d12ea7@google.com> To: Rich Felker , Yoshinori Sato , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas X-Mailer: b4 0.10.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1666381029; l=2009; i=bhelgaas@google.com; s=20221014; h=from:subject:message-id; bh=8UKhu6SX8DGey6kmjCz3BO86QD79+K2wUhfKHDjrdCk=; b=ijuER2q4Zdn6CQkGbuXFSsYkilANhzlZtWGiSZHUTKE1TmMeEqUomg+ceMjAZT7Sc5mf9BKMctC4 aUZdfA08BaLRDQGOWXJSTGBENzi3KIelyXOLjviA6uf/KjWjJIVv X-Developer-Key: i=bhelgaas@google.com; a=ed25519; pk=bFjaHnNobtkUv3f7ErkQcm+PpbyCUUBlIfqMtNRJwQs= Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Previously __BUILD_IOPORT_SINGLE() accepted a "pfx" parameter, to which __BUILD_IOPORT_PFX(), the only user of __BUILD_IOPORT_SINGLE(), passed along its own "bus" parameter. But users of __BUILD_IOPORT_PFX() supplied nothing, so both "bus" and "pfx" are pointless. Remove them. Signed-off-by: Bjorn Helgaas --- arch/sh/include/asm/io.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 8043b7c235ca..193640bd9563 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -140,9 +140,9 @@ static inline void __set_io_port_base(unsigned long pbase) extern void __iomem *__ioport_map(unsigned long addr, unsigned int size); #endif -#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, p) \ +#define __BUILD_IOPORT_SINGLE(bwlq, type, p) \ \ -static inline void pfx##out##bwlq##p(type val, unsigned long port) \ +static inline void out##bwlq##p(type val, unsigned long port) \ { \ volatile type *__addr; \ \ @@ -150,7 +150,7 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \ *__addr = val; \ } \ \ -static inline type pfx##in##bwlq##p(unsigned long port) \ +static inline type in##bwlq##p(unsigned long port) \ { \ volatile type *__addr; \ type __val; \ @@ -161,12 +161,12 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ return __val; \ } -#define __BUILD_IOPORT_PFX(bus, bwlq, type) \ - __BUILD_IOPORT_SINGLE(bus, bwlq, type,) \ - __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p) +#define __BUILD_IOPORT_PFX(bwlq, type) \ + __BUILD_IOPORT_SINGLE(bwlq, type,) \ + __BUILD_IOPORT_SINGLE(bwlq, type, _p) #define BUILDIO_IOPORT(bwlq, type) \ - __BUILD_IOPORT_PFX(, bwlq, type) + __BUILD_IOPORT_PFX(bwlq, type) BUILDIO_IOPORT(b, u8) BUILDIO_IOPORT(w, u16)