From patchwork Fri Oct 21 20:24:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp889408wrr; Fri, 21 Oct 2022 13:31:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ti+5UaxTkaXcF0qQjxdvJmSTdBvxrCmhe6bV+D83w7N4TPTn0rxKjd+so9zTSYvN8cc7F X-Received: by 2002:a17:906:5a48:b0:78e:18a1:32ba with SMTP id my8-20020a1709065a4800b0078e18a132bamr17021917ejc.346.1666384274028; Fri, 21 Oct 2022 13:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666384274; cv=none; d=google.com; s=arc-20160816; b=v/SS9deJP+0iic4AGkSfSdu7WaZy0Z9p8jY6KF6yxCwXmSIGd4k1mEFQaKcwJUkJ9g JtYqJPPd5CCR64subCi3q5m/kEPQUtEt5tmie87xxNzTbBzAe5vEs2RlL5ZzMAFtyNqY BYNtCjDazLWgL1aPoXIil+nEU0aCVAvXIv0K1vNFNj8GU9TUhUb8akqLtcVyVE3Yoc70 jWl7YyKwAj6r6rLHKxDaVDUZLRTvHZzdObwGSh3znsdQdpadS6nDCImwE7VNb6z8Q40F llQWUE1MheVHPcxO3EusUM+3dz8ShpdJh5Ijz8jLyDTMzM3PYl43DFxD53YuwcgyABTY 8LPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wM7b80Fs8fMhHnY7MGTXxKznKd1hJYbWMfGjTmk1MkU=; b=qrDTW2WWv+kC6iXu9IyZof3Bs13THzy1PPBTg2cnxAf7YKNvzLTg6FFclOyixD3JOR ERerrW24rNX54DBnEKBEM1sD8eFBC1N7QND6dgE4gnYev1jrWbv7bvJ9uqExJw/5OALE Im7f1hZbYiQnoagfoyDyqRASWFnltY4c8dAHzb8DeJjF10DBixPXFYhh/qgpJ2OcFQQx rtoJGMEauMbSiF/Zx2ZTMiOtp1e0Y+vi3gVfIQPgKipsn19dXpJGP6SvC0/OSWpzx2hG JEbYlNawKlDYe3ODmlOmm4kIXJXu+H2IHYSF9ZQwR+/NFnymGMQMAgDpS7PhqHHnN6vJ cyTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z5F7bpW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb8-20020a170907160800b0078239e3f846si23442996ejc.1.2022.10.21.13.30.36; Fri, 21 Oct 2022 13:31:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z5F7bpW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbiJUUYz (ORCPT + 99 others); Fri, 21 Oct 2022 16:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbiJUUYm (ORCPT ); Fri, 21 Oct 2022 16:24:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 378E639B81; Fri, 21 Oct 2022 13:24:41 -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 E2339B82D23; Fri, 21 Oct 2022 20:24:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 799CFC433C1; Fri, 21 Oct 2022 20:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666383878; bh=Sold5O9Z0l2jkV+weo40l2ACFBfyKqurUW9j4tWzf9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z5F7bpW03JDQ1QfA+ZZPsS9amEAAU8bSadiiM/irqZIYUY+a4dZ2E4wLIiuvqCx0Z Th2TCoRdshRRwJTo4gZ5Lco+VMzx7Nu8xZDkA3HbZ8M2SEHVKyypISackNZuugzdBS tcc/cPiZHIBG26aGA+mCHGXj+aBr8PiozkePChG2LhqwJrcl2uDxIiZTBm0JXetBNZ KcDqUTb4IDYG3f5OFr1uzaLsCNIqHC/lfFSoQ2w9tpzZF8D7DbDUk3hXw6wrN7o/TE 6Z/MLMIvGJWEjYflr45A2uujM6IErMI/z1UP6c4qzvZ79VteTlvBvJ9hWibgtX6vug 30nZcPZHpVGJQ== From: Bjorn Helgaas To: Yoshinori Sato , Rich Felker Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/4] sh: remove unused __BUILD_IOPORT_SINGLE 'pfx' parameter Date: Fri, 21 Oct 2022 15:24:22 -0500 Message-Id: <20221021202424.307531-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221021202424.307531-1-helgaas@kernel.org> References: <20221021202424.307531-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747330556593360324?= X-GMAIL-MSGID: =?utf-8?q?1747330556593360324?= From: Bjorn Helgaas 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)