From patchwork Fri Oct 7 16:32:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366725 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 3E2C460487 for ; Fri, 7 Oct 2016 16:32:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3043529777 for ; Fri, 7 Oct 2016 16:32:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24CC829779; Fri, 7 Oct 2016 16:32:18 +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 D597929777 for ; Fri, 7 Oct 2016 16:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932291AbcJGQcO (ORCPT ); Fri, 7 Oct 2016 12:32:14 -0400 Received: from mail.kernel.org ([198.145.29.136]:50390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939006AbcJGQcN (ORCPT ); Fri, 7 Oct 2016 12:32:13 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3951A20340; Fri, 7 Oct 2016 16:32:12 +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 3F2A42013D; Fri, 7 Oct 2016 16:32:11 +0000 (UTC) Subject: [PATCH 7/8] PCI: armada: Reorder local declaration To: Thomas Petazzoni From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Date: Fri, 07 Oct 2016 11:32:09 -0500 Message-ID: <20161007163209.24582.85495.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007163118.24582.12385.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <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 Move initialized local variable declaration to top and set drvdata pointer only when the probe function succeeds. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pcie-armada8k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 19086a4..36002e4 100644 --- a/drivers/pci/host/pcie-armada8k.c +++ b/drivers/pci/host/pcie-armada8k.c @@ -197,9 +197,9 @@ static int armada8k_add_pcie_port(struct armada8k_pcie *armada8k, static int armada8k_pcie_probe(struct platform_device *pdev) { + struct device *dev = &pdev->dev; struct armada8k_pcie *armada8k; struct pcie_port *pp; - struct device *dev = &pdev->dev; struct resource *base; int ret; @@ -215,7 +215,6 @@ static int armada8k_pcie_probe(struct platform_device *pdev) pp = &armada8k->pp; pp->dev = dev; - platform_set_drvdata(pdev, armada8k); /* Get the dw-pcie unit configuration/control registers base. */ base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); @@ -230,6 +229,7 @@ static int armada8k_pcie_probe(struct platform_device *pdev) if (ret) goto fail; + platform_set_drvdata(pdev, armada8k); return 0; fail: