From patchwork Mon Jul 25 15:12:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 12928252 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4DF35C43334 for ; Mon, 25 Jul 2022 15:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BbJMmUwtIaaXtquASwroRiR8XCuelgH3mX4zMiAbEyY=; b=Oe+dyv1DQ7AQ5M u1k+/7YoQR63X7gMzXo78A204ZVnAb5ALxR/EPl2oHRq/jrOBcO1sO2rQimYi8HouGIoDYZVOzZKN HML5AJCB2fIBjOZG6WuJ75m3Uwbmi/Za117XRIMmP145Ug+9JA7qpgeRbyPKTmM6YbzmFLzf3v+ia gAFcalRmqt9Fsy/OjEEOcxmydpjl1SbHRwilSsT0CFwj4oqhH5MldpqbMQTqcBgFkNKa+soc6uczX q/iBe3Kyzg8rkBOz6GzkJ3CRZZFtx56Qpin0wcwuBIcDZrJIsJF5NrLfZEPsYzakowMJJXtI1pZFQ UBW34lb38bpD9RfFg1ng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oG0Ib-00FSKj-T2; Mon, 25 Jul 2022 15:47:16 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFzmC-00FH4i-IQ; Mon, 25 Jul 2022 15:13:45 +0000 Received: by mail-pj1-x102c.google.com with SMTP id b7-20020a17090a12c700b001f20eb82a08so14650508pjg.3; Mon, 25 Jul 2022 08:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XRISqH0YEt9x37mOvZB1aRfZZEl6+ks0JDgNi4Ug7Zk=; b=o5neeh4ryOoBCB8aglOKL52nvvcBgFyio+39f1GPtB2O/slaQJdSCAr4qATZhCQmF7 1zjFyzWkusGEbaJI6oYjegXXuPo5ICsGd2dXIQ3WCRyjOMFl1YGlKEM/kFKKyzPx72An 8bKV15YiEXk1Ungcvs+IogfaUTguat61aZa9aDVmg4Q/qvSsp4AhG19nCC+xfY3ti/Fx geXalA7hGJGtLujyQ4lCHfgFo1jn7cZ3B0VK+qwRSVNqXAysraPUQa2by2+4YDAEhftO xpAiofVS6Qh3GnK8oRRIe2TiGXoHU+WOyIcastiLhcc/h49+tTNlSpugOwWQo1fONNrV N0Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XRISqH0YEt9x37mOvZB1aRfZZEl6+ks0JDgNi4Ug7Zk=; b=5DJ0wEKrX5HrwwRDTCG+dsdIkdUX7SMEopDyyCIyRZ3BtxuBkRVCAGQzla076OO8iU //FpHDiS5hOsBUModuPPxGUH3QDGHRj2hjss0PToUU/+OKHXQxLlBybDfXct7U8fFmRf z5Sgme62fGByy06b+KOEJuXgzgQjVdqRGatOsMak96HPgNzLNSLsqel/T2jepE3vuHQL 03zksmE7tZdlkKz2DLf9TxwpcsK1suxJDV6wr/i3TeRb+9HFqqRD6+tB5hB9uYHsWTr+ EgEX0s2sthdGBTp+H4Ac5xCmWEQPXadAtZBQ+CBtj+dWB+b/JrJ8hyNq8kPESTTiTd1G H8MQ== X-Gm-Message-State: AJIora+UIX6S3swR6c8diDtDTCSYqB0GkCPXgycrQnoIXUQFYKknTRdb IlrjmHHdAhZi9nBW/VVLfKXf/vkTuJE= X-Google-Smtp-Source: AGRyM1uCEX3dmY0dBa+CpILOTqJu48Q9xyKEqm4oI4EyeWgqGjO1n1uVJmCPP5x3Ng2Y3fble129qw== X-Received: by 2002:a17:902:c40a:b0:16d:2dbd:35cd with SMTP id k10-20020a170902c40a00b0016d2dbd35cdmr12397728plk.65.1658762022801; Mon, 25 Jul 2022 08:13:42 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id a9-20020a170902ecc900b001641b2d61d4sm6649667plh.30.2022.07.25.08.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 08:13:42 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 7/7] PCI: brcmstb: Have .map_bus function names end with 'map_bus' Date: Mon, 25 Jul 2022 11:12:56 -0400 Message-Id: <20220725151258.42574-8-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220725151258.42574-1-jim2101024@gmail.com> References: <20220725151258.42574-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220725_081344_636753_062EF6FF X-CRM114-Status: GOOD ( 11.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Conform with other drivers' map_bus functions. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index fc1d36f6094e..b40733dd253c 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -685,7 +685,7 @@ static bool brcm_pcie_link_up(struct brcm_pcie *pcie) return dla && plu; } -static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn, +static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus, unsigned int devfn, int where) { struct brcm_pcie *pcie = bus->sysdata; @@ -706,7 +706,7 @@ static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn, return base + PCIE_EXT_CFG_DATA + (where & 0xfff); } -static void __iomem *brcm_pcie_map_conf32(struct pci_bus *bus, unsigned int devfn, +static void __iomem *brcm_pcie_map_bus32(struct pci_bus *bus, unsigned int devfn, int where) { struct brcm_pcie *pcie = bus->sysdata; @@ -1509,7 +1509,7 @@ static const struct of_device_id brcm_pcie_match[] = { }; static struct pci_ops brcm_pcie_ops = { - .map_bus = brcm_pcie_map_conf, + .map_bus = brcm_pcie_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, .add_bus = brcm_pcie_add_bus, @@ -1517,7 +1517,7 @@ static struct pci_ops brcm_pcie_ops = { }; static struct pci_ops brcm_pcie_ops32 = { - .map_bus = brcm_pcie_map_conf32, + .map_bus = brcm_pcie_map_bus32, .read = pci_generic_config_read32, .write = pci_generic_config_write32, .add_bus = brcm_pcie_add_bus,