From patchwork Wed Nov 22 05:31:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 840269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="B0PgMIf6"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="clicVrao"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhWLK48mXz9s7g for ; Wed, 22 Nov 2017 16:32:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751759AbdKVFcU (ORCPT ); Wed, 22 Nov 2017 00:32:20 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:39402 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751740AbdKVFcR (ORCPT ); Wed, 22 Nov 2017 00:32:17 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E86556080B; Wed, 22 Nov 2017 05:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328736; bh=TpExw4NG0fG2Q8uEsXNrZdg0k/51jkxiRaNltMIpQeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0PgMIf6j/H68+eNqm2qBsuE6B2rYGao+pMgRiQ1zAWMPkf8N3JTZJo1RCqzPlJvK OA2RRej6SSTsBfKS34kB78JJ/lmRKuE1bUCpyITDtTLWotX8IEOqA/N+AOyh2Fhjr+ 569wtRJrhlrfH+zo0Xkim+Hg5LKLSgx7OofqbeQQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 95BB5609BD; Wed, 22 Nov 2017 05:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328725; bh=TpExw4NG0fG2Q8uEsXNrZdg0k/51jkxiRaNltMIpQeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=clicVraoHa09PzQzzoPkCeOcXx2vJhrV/AMnGu5wwwixAmrv+yEXj1IgvxVQ8E7xT 4sHJILAlNjwiSBzXHqzxQwXXMgA6GTS3tIG5WttA1bvlfIxOKxZQKfV8w4q47vl2tl ECZSHWR/YfswZg2xVdXCkaH2ZmHPx32+KjUU+pMg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 95BB5609BD Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , "David S. Miller" , Tobias Klauser , Eric Dumazet , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 16/30] pch_gbe: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:01 -0500 Message-Id: <1511328675-21981-17-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> References: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't extract the domain number. Other places, use the actual domain number from the device. Signed-off-by: Sinan Kaya --- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 5ae9681..0df94ac 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2560,6 +2560,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, { struct net_device *netdev; struct pch_gbe_adapter *adapter; + int domainnr, busnr; int ret; ret = pcim_enable_device(pdev); @@ -2603,8 +2604,10 @@ static int pch_gbe_probe(struct pci_dev *pdev, if (adapter->pdata && adapter->pdata->platform_init) adapter->pdata->platform_init(pdev); - adapter->ptp_pdev = pci_get_bus_and_slot(adapter->pdev->bus->number, - PCI_DEVFN(12, 4)); + domainnr = pci_domain_nr(adapter->pdev->bus); + busnr = adapter->pdev->bus->number + adapter->ptp_pdev = pci_get_domain_bus_and_slot(domainnr, busnr, + PCI_DEVFN(12, 4)); netdev->netdev_ops = &pch_gbe_netdev_ops; netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;