From patchwork Tue Dec 19 05:37:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122453 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 1C38E60390 for ; Tue, 19 Dec 2017 05:44:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EBCF29042 for ; Tue, 19 Dec 2017 05:44:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 020AA2905A; Tue, 19 Dec 2017 05:44:06 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 B813029042 for ; Tue, 19 Dec 2017 05:44:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934109AbdLSFnr (ORCPT ); Tue, 19 Dec 2017 00:43:47 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:55350 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760937AbdLSFjS (ORCPT ); Tue, 19 Dec 2017 00:39:18 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2CD4F60B17; Tue, 19 Dec 2017 05:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661958; bh=bBEK35d8UefyZJ168rG12KVASZkE7+dqByUWoxZHOjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrAoIs+dc16IMKn3Vl7UmhdHkj8sTgmYm/zIC6gCDq8baeFw4oOsM18EYByzEEljT WsXhq3hMvhnW6gOIOcYefPwneGVq6Y+d1Gn7RoWwKNnwzTig7Nv3XcbxeGeefFZ42L SSrCe+alZkJ8zQR0iuVIZE/IYMFqC57KI1OgzZGE= 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 3A17C60B17; Tue, 19 Dec 2017 05:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661957; bh=bBEK35d8UefyZJ168rG12KVASZkE7+dqByUWoxZHOjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FtkNW5HvMccfLfixYhVyom6X3jUa6GLlChU/7tTNCM4nBs/sHA5NCI9okgh2UYtk2 7t5ATksFiK3tuvFeyCRkdk+a8aR2HhjOsGe9BWqXVtGzObhWIvooVkSANcU5po4wUE lL+mqx0TrsqIegRYv5qGKOAQY/s28F2sodhXRuSI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3A17C60B17 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" , Kees Cook , Eric Dumazet , Tobias Klauser , Andy Shevchenko , netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 14/26] pch_gbe: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:50 -0500 Message-Id: <1513661883-28662-15-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1513661883-28662-1-git-send-email-okaya@codeaurora.org> References: <1513661883-28662-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 X-Virus-Scanned: ClamAV using ClamSMTP 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. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). Use the domain information from pdev while calling into pci_get_domain_bus_and_slot() function. Signed-off-by: Sinan Kaya Acked-by: David S. Miller --- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 6 ++++-- 1 file changed, 4 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 40e52ff..7cd4946 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 @@ -2594,8 +2594,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)); + adapter->ptp_pdev = + pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus), + adapter->pdev->bus->number, + PCI_DEVFN(12, 4)); netdev->netdev_ops = &pch_gbe_netdev_ops; netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;