From patchwork Fri Oct 7 16:31:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366709 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5770A60487 for ; Fri, 7 Oct 2016 16:31:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48B2029777 for ; Fri, 7 Oct 2016 16:31:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D6D229779; Fri, 7 Oct 2016 16:31:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7EB629777 for ; Fri, 7 Oct 2016 16:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756637AbcJGQbX (ORCPT ); Fri, 7 Oct 2016 12:31:23 -0400 Received: from mail.kernel.org ([198.145.29.136]:49998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234AbcJGQbW (ORCPT ); Fri, 7 Oct 2016 12:31:22 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C2DB203AC; Fri, 7 Oct 2016 16:31:21 +0000 (UTC) Received: from localhost (unknown [69.55.156.165]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4668420260; Fri, 7 Oct 2016 16:31:20 +0000 (UTC) Subject: [PATCH 1/8] PCI: armada: Name private struct pointer "armada8k" consistently To: Thomas Petazzoni From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Date: Fri, 07 Oct 2016 11:31:18 -0500 Message-ID: <20161007163118.24582.12385.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use a device-specific name, "armada8k", for struct armada8k_pcie pointers to hint that this is device-specific information. No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Thomas Petazzoni --- drivers/pci/host/pcie-armada8k.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/host/pcie-armada8k.c b/drivers/pci/host/pcie-armada8k.c index 0f4f570..f88a790 100644 --- a/drivers/pci/host/pcie-armada8k.c +++ b/drivers/pci/host/pcie-armada8k.c @@ -72,12 +72,11 @@ struct armada8k_pcie { static int armada8k_pcie_link_up(struct pcie_port *pp) { - struct armada8k_pcie *pcie = to_armada8k_pcie(pp); + struct armada8k_pcie *armada8k = to_armada8k_pcie(pp); u32 reg; u32 mask = PCIE_GLB_STS_RDLH_LINK_UP | PCIE_GLB_STS_PHY_LINK_UP; - reg = readl(pcie->base + PCIE_GLOBAL_STATUS_REG); - + reg = readl(armada8k->base + PCIE_GLOBAL_STATUS_REG); if ((reg & mask) == mask) return 1; @@ -87,8 +86,8 @@ static int armada8k_pcie_link_up(struct pcie_port *pp) static void armada8k_pcie_establish_link(struct pcie_port *pp) { - struct armada8k_pcie *pcie = to_armada8k_pcie(pp); - void __iomem *base = pcie->base; + struct armada8k_pcie *armada8k = to_armada8k_pcie(pp); + void __iomem *base = armada8k->base; u32 reg; if (!dw_pcie_link_up(pp)) { @@ -146,8 +145,8 @@ static void armada8k_pcie_host_init(struct pcie_port *pp) static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg) { struct pcie_port *pp = arg; - struct armada8k_pcie *pcie = to_armada8k_pcie(pp); - void __iomem *base = pcie->base; + struct armada8k_pcie *armada8k = to_armada8k_pcie(pp); + void __iomem *base = armada8k->base; u32 val; /* @@ -199,25 +198,25 @@ static int armada8k_add_pcie_port(struct pcie_port *pp, static int armada8k_pcie_probe(struct platform_device *pdev) { - struct armada8k_pcie *pcie; + struct armada8k_pcie *armada8k; struct pcie_port *pp; struct device *dev = &pdev->dev; struct resource *base; int ret; - pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); - if (!pcie) + armada8k = devm_kzalloc(dev, sizeof(*armada8k), GFP_KERNEL); + if (!armada8k) return -ENOMEM; - pcie->clk = devm_clk_get(dev, NULL); - if (IS_ERR(pcie->clk)) - return PTR_ERR(pcie->clk); + armada8k->clk = devm_clk_get(dev, NULL); + if (IS_ERR(armada8k->clk)) + return PTR_ERR(armada8k->clk); - clk_prepare_enable(pcie->clk); + clk_prepare_enable(armada8k->clk); - pp = &pcie->pp; + pp = &armada8k->pp; pp->dev = dev; - platform_set_drvdata(pdev, pcie); + platform_set_drvdata(pdev, armada8k); /* Get the dw-pcie unit configuration/control registers base. */ base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); @@ -228,7 +227,7 @@ static int armada8k_pcie_probe(struct platform_device *pdev) goto fail; } - pcie->base = pp->dbi_base + PCIE_VENDOR_REGS_OFFSET; + armada8k->base = pp->dbi_base + PCIE_VENDOR_REGS_OFFSET; ret = armada8k_add_pcie_port(pp, pdev); if (ret) @@ -237,8 +236,8 @@ static int armada8k_pcie_probe(struct platform_device *pdev) return 0; fail: - if (!IS_ERR(pcie->clk)) - clk_disable_unprepare(pcie->clk); + if (!IS_ERR(armada8k->clk)) + clk_disable_unprepare(armada8k->clk); return ret; }