From patchwork Fri Oct 7 16:24:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366587 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 0940760487 for ; Fri, 7 Oct 2016 16:24:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFA5F29770 for ; Fri, 7 Oct 2016 16:24:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E474429774; Fri, 7 Oct 2016 16:24: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 97B8D29770 for ; Fri, 7 Oct 2016 16:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938902AbcJGQYN (ORCPT ); Fri, 7 Oct 2016 12:24:13 -0400 Received: from mail.kernel.org ([198.145.29.136]:46692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938999AbcJGQYE (ORCPT ); Fri, 7 Oct 2016 12:24:04 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B64EB203B5; Fri, 7 Oct 2016 16:24:02 +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 B6564203AE; Fri, 7 Oct 2016 16:24:01 +0000 (UTC) Subject: [PATCH 7/7] PCI: iproc: Set drvdata at end of probe function To: Jon Mason , Ray Jui , Scott Branden From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Date: Fri, 07 Oct 2016 11:24:00 -0500 Message-ID: <20161007162400.23015.76859.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007162311.23015.37203.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007162311.23015.37203.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 Set the drvdata pointer at the end of probe function for consistency with other drivers. We don't need the drvdata until after the probe completes, and we don't need it at all if the probe fails. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pcie-iproc-bcma.c | 2 +- drivers/pci/host/pcie-iproc-platform.c | 2 +- 2 files 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-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c index bc364a7..800bc84 100644 --- a/drivers/pci/host/pcie-iproc-bcma.c +++ b/drivers/pci/host/pcie-iproc-bcma.c @@ -53,7 +53,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) return -ENOMEM; iproc->dev = dev; - bcma_set_drvdata(bdev, iproc); iproc->base = bdev->io_addr; if (!iproc->base) { @@ -77,6 +76,7 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) pci_free_resource_list(&res); + bcma_set_drvdata(bdev, iproc); return ret; } diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c index 6baaae1..31c0fb9 100644 --- a/drivers/pci/host/pcie-iproc-platform.c +++ b/drivers/pci/host/pcie-iproc-platform.c @@ -59,7 +59,6 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) iproc->dev = dev; iproc->type = (enum iproc_pcie_type)of_id->data; - platform_set_drvdata(pdev, iproc); ret = of_address_to_resource(np, 0, ®); if (ret < 0) { @@ -124,6 +123,7 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) pci_free_resource_list(&res); + platform_set_drvdata(pdev, iproc); return ret; }