From patchwork Fri Jan 13 08:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 43077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp158501wrt; Fri, 13 Jan 2023 00:52:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXsvkHrehzRVvL5zLX01IK/mWfIQDgdApfI/4rdl6dQ3RCZyiyMMeIwJ/oBjqjZLW3s5qxoO X-Received: by 2002:a17:90b:19c8:b0:227:6e2:8037 with SMTP id nm8-20020a17090b19c800b0022706e28037mr20396367pjb.32.1673599946313; Fri, 13 Jan 2023 00:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673599946; cv=none; d=google.com; s=arc-20160816; b=j5B+EraJym8h1bQjhTKlaGU6EMGhXSgqbpDoeYDjiF8Z5S+sTO9AtiDYoh8ZV0Poc2 oJqWIrVSR4nX4sHY47wTnQlkmIo8QyjmwNz0rDwYKB9SWh/cUW26LyAiRexz+RfVwr7C k0wLxtly0CAL6VhMTYo/XOBmuT0sK2W/g5j0iunMQlRT/5mt0IiDTaGsfxMe3I/WxHYY Lt989TwQypWqyWjzs1C419iDIjN0YJC9TwjCXMH1Qf6du1ix89z9GdXxUbowZKzhC3SW 9rEq0s+sVvq6+G/PynWR02hbUx5/jocTLZ20jLjgG/DGHRcbLZ+i6gKNt/yzSzgRLCMd 00cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=5zces+1O7hY7iJZIJRBo/L6sfY3J8Lf9pSZe8jUHoT4=; b=KX6r5UtGhJwCkyRAAHnY3CSJ8xSR/TPQDgQI/iClOU1VA9GlSsLu+6sP5Ui4hc7JRS 88uBwKAcrYf4JGRq4DEWsAB9cNQwKg5e/1OtfYsIxw4Hr6OE7UNXB+DVdo+qVKcd9mf1 aGRJLdLeSyvBSLcLVKO813wvKD8VV2mdW2TyXdBD05Ljh/8+mKWw3A9YvYlgUIpdQj85 KrQSxEVRflHckDu9S1HETpTWcpWt23qWEt7IaMCUxBWhP5rTK7SG2DWu+sa5f5ukWFSM 4fRbaWDgXpSXcUa4uOZHTuNPFGKv4qtCwj8Ibb/VzIGok6DwV03RA+Y2s1JezPwD6+T8 +4jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="JKMm/rO/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id np7-20020a17090b4c4700b00225e968b33bsi22451349pjb.85.2023.01.13.00.52.14; Fri, 13 Jan 2023 00:52:26 -0800 (PST) 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=@gmail.com header.s=20210112 header.b="JKMm/rO/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240832AbjAMIsC (ORCPT + 99 others); Fri, 13 Jan 2023 03:48:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240492AbjAMIru (ORCPT ); Fri, 13 Jan 2023 03:47:50 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37D0FAE47; Fri, 13 Jan 2023 00:47:49 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id az20so31612894ejc.1; Fri, 13 Jan 2023 00:47:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5zces+1O7hY7iJZIJRBo/L6sfY3J8Lf9pSZe8jUHoT4=; b=JKMm/rO/PyuWX0pLZaQ1Z9zOgUz9h7kRg514ktxGbI/sVGXPQvtQPPMjkXcxqRbEil aop0kvCe3t30/gZbUJh3bQtbtL2I2HJD2fi5mtBUve4uDiJ6v/YZyAmUCIvK+CucpN6T rQoR9sI836bFdld/HVmHIjSnPL1p+CvgEosOyoSOjHi2x5pEBYgVOho/n7nxzCECvnd9 I4Vb2vktrjJWRVL5I4/C32a1/4uYwXjMRSDQnGePvquuPWwN625miLmunbBoqveDDP8Q FBCwHLRwwU0DgyPP65Sd4xrzNrw4dOvLTSGzWP9HAaJCmJxBWg4D+rhP9hq5danAgyLv 40Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5zces+1O7hY7iJZIJRBo/L6sfY3J8Lf9pSZe8jUHoT4=; b=KYoAJHpVa4N7VSjKtTPnPKg2cVusijISSvdO72zhr9gpYeaYa3dvz6I0KBTppAiiWu awA3sDG75upCA3hzu1kWMQxLXIlEX66mQ9tqzt/+o92J5RS5i0NhQTe7qapidu7w4NVH PZGnDNp2dPsDpjMhj5CAye+5GZDxVvFUiYRh8BXQC6KavtZ0/B0tbnJ5mk5WaL1oIEzf qWhz9RXyKtTrC9+GAWvW7TtFsRlrmMXNnporkbFJ+Is127Wfkoyse0qFSQADA7XwiwSS HE/mMR8NAOpy6+/mwILWyGebxoU6bwQBiTG47hIW9/xqCjZ2P2hvxlLKdFlqyjnO+LpN Lxog== X-Gm-Message-State: AFqh2kod3lcj1/wBMkUWyYjE2eGd7gTpfRtBqQrqTo/2JHedt0WVL1xL okTFtoDJqIX3sMjrn7bmkvQ= X-Received: by 2002:a17:906:19ce:b0:858:cccd:7c6a with SMTP id h14-20020a17090619ce00b00858cccd7c6amr10722125ejd.68.1673599667620; Fri, 13 Jan 2023 00:47:47 -0800 (PST) Received: from felia.fritz.box (ipbcc1d920.dynamic.kabel-deutschland.de. [188.193.217.32]) by smtp.gmail.com with ESMTPSA id q5-20020aa7d445000000b00482b3d0e1absm7944996edr.87.2023.01.13.00.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 00:47:47 -0800 (PST) From: Lukas Bulwahn To: Marek Vasut , Yoshihiro Shimoda , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] PCI: rcar: avoid defines prefixed with CONFIG Date: Fri, 13 Jan 2023 09:45:16 +0100 Message-Id: <20230113084516.31888-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1754896737409322264?= X-GMAIL-MSGID: =?utf-8?q?1754896737409322264?= Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file. Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE. Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG". No functional change. Signed-off-by: Lukas Bulwahn Reviewed-by: Geert Uytterhoeven --- drivers/pci/controller/pcie-rcar-host.c | 4 ++-- drivers/pci/controller/pcie-rcar.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index e4faf90feaf5..52fdafe5c877 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -219,9 +219,9 @@ static int rcar_pcie_config_access(struct rcar_pcie_host *host, /* Enable the configuration access */ if (pci_is_root_bus(bus->parent)) - rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR); + rcar_pci_write_reg(pcie, CONFIGURE_SEND_ENABLE | TYPE0, PCIECCTLR); else - rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR); + rcar_pci_write_reg(pcie, CONFIGURE_SEND_ENABLE | TYPE1, PCIECCTLR); /* Check for errors */ if (rcar_pci_read_reg(pcie, PCIEERRFR) & UNSUPPORTED_REQUEST) diff --git a/drivers/pci/controller/pcie-rcar.h b/drivers/pci/controller/pcie-rcar.h index 9bb125db85c6..a09f58ab04ca 100644 --- a/drivers/pci/controller/pcie-rcar.h +++ b/drivers/pci/controller/pcie-rcar.h @@ -11,7 +11,7 @@ #define PCIECAR 0x000010 #define PCIECCTLR 0x000018 -#define CONFIG_SEND_ENABLE BIT(31) +#define CONFIGURE_SEND_ENABLE BIT(31) #define TYPE0 (0 << 8) #define TYPE1 BIT(8) #define PCIECDR 0x000020