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: 9367047 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 025ED60752 for ; Fri, 7 Oct 2016 16:48:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E661F297A0 for ; Fri, 7 Oct 2016 16:48:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB370297A4; Fri, 7 Oct 2016 16:48:46 +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 87429297A0 for ; Fri, 7 Oct 2016 16:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941345AbcJGQmr (ORCPT ); Fri, 7 Oct 2016 12:42:47 -0400 Received: from mail.kernel.org ([198.145.29.136]:57734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941341AbcJGQmm (ORCPT ); Fri, 7 Oct 2016 12:42:42 -0400 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 Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org 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-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 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(-) -- 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/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; }