From patchwork Fri Oct 7 16:42:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 679630 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3srFz45gsVz9s2Q for ; Sat, 8 Oct 2016 03:56:16 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3srFz44ChCzDrST for ; Sat, 8 Oct 2016 03:56:16 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3srFgP1cXvzDrSL for ; Sat, 8 Oct 2016 03:42:38 +1100 (AEDT) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FCFC203A0; Fri, 7 Oct 2016 16:42:36 +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 1E9B3203B1; Fri, 7 Oct 2016 16:42:35 +0000 (UTC) Subject: [PATCH 6/7] PCI: layerscape: Move struct pcie_port setup to probe function To: Minghuan Lian , Mingkai Hu , Roy Zang From: Bjorn Helgaas Date: Fri, 07 Oct 2016 11:42:33 -0500 Message-ID: <20161007164233.26341.56205.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007164149.26341.87049.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007164149.26341.87049.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, NML_ADSP_CUSTOM_MED,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Do the basic pcie_port setup in the probe function for consistency with other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-layerscape.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c index bf1ce11..9b74485 100644 --- a/drivers/pci/host/pci-layerscape.c +++ b/drivers/pci/host/pci-layerscape.c @@ -218,9 +218,6 @@ static int __init ls_add_pcie_port(struct ls_pcie *ls, struct pcie_port *pp = &ls->pp; int ret; - pp->dev = &pdev->dev; - pp->ops = ls->drvdata->ops; - ret = dw_pcie_host_init(pp); if (ret) { dev_err(pp->dev, "failed to initialize host\n"); @@ -235,6 +232,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; const struct of_device_id *match; struct ls_pcie *ls; + struct pcie_port *pp; struct resource *dbi_base; int ret; @@ -246,6 +244,12 @@ static int __init ls_pcie_probe(struct platform_device *pdev) if (!ls) return -ENOMEM; + ls->drvdata = match->data; + + pp = &ls->pp; + pp->dev = dev; + pp->ops = ls->drvdata->ops; + dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); ls->pp.dbi_base = devm_ioremap_resource(dev, dbi_base); if (IS_ERR(ls->pp.dbi_base)) { @@ -253,7 +257,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev) return PTR_ERR(ls->pp.dbi_base); } - ls->drvdata = match->data; ls->lut = ls->pp.dbi_base + ls->drvdata->lut_offset; if (!ls_pcie_is_bridge(ls)) @@ -264,7 +267,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev) return ret; platform_set_drvdata(pdev, ls); - return 0; }