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: 10069833 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 9CA4D60353 for ; Wed, 22 Nov 2017 06:36:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 937FB29B9D for ; Wed, 22 Nov 2017 06:36:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 885B429B9F; Wed, 22 Nov 2017 06:36:20 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1FD4129B9D for ; Wed, 22 Nov 2017 06:36:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jqBmobLC7MWz4nRJVZHf+fAQYZzZnWRxMo44ZpESN4E=; b=FOPvadTiH0EyAPnfnF3oN6loM9 uRX4k19OKTGHQufyHie2RlSUdGuYjEp0aOb46lX7v3gpiyQ4v5y0o0YfBZSFZFlFWtIlyIAHWWld5 RCTgkqT6fB1SdiijsFoixmOP7/W3T3SURF3W+Qodvz1/E5CC6WHyxmHS4itiMYcmTAVU7gGt8Gv0q 813ouqUQnIpiKUQPW98YQLk2wwy4hGb4iqEt68ZeFHpZIEtU6idTG0MVN/pJ7I5FuwxYfIx4at6mR Rmlx2jqMJvDpekzyZNXmvZhlyIbcjc5mjC8vIAKLTFhNOZ6C85JaGbk+LDmX3F7XjVq+9lSLdw6av vDnUcOvA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eHOdn-0000aN-Lc; Wed, 22 Nov 2017 06:36:11 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHOcG-0006I2-E3 for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 06:34:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZJhvqCHWo3zdoz+ARX6dVdYcJk2bB3XJtWpd7yiEURY=; b=cX6CvWQSbnP1CWVZbCVDAeIBN 4ChzQC6mwe2SqQnp3K2eDykDkkS1icRUq3w1cVViheUC9MFTg6qcD17wb5BLvQ8kxyuxxcaFKeRVw kfv2zYNiRYe0p8ZJ7pN4njdMekTHMLhkbE+IMXVSE2El4ClYaaMbmJKJd7aZz5POZnQvKNH0TY18g Wg3L39J95SkmGoiM/Eh0gtiAb35suawQgqlb+soU5UzjlCyEKNiie3Ir2FwEQ0HfcCK2SARDwVIzU Oxm1Vj7oz52WXxpIRPT6PVIs4sp+OQK+k0fRdDzaAy8aTp3Lai3oXZeTnARg6/TbkGwV+oQOuDWZn /hIdmnxxQ==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNeH-0000Yr-1S for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3A94A6084D; 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=1511328733; bh=TpExw4NG0fG2Q8uEsXNrZdg0k/51jkxiRaNltMIpQeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IDUUnJZVysuxSWHDS5ey/ZXb7pOQ8TT1y5w8yEFYlrrgwkco5YtturOk/5ZEUOb4y n7XerZiq2mDzj9B+hzJb0TpA6c/m2suLC8aSbO1PkMYbTwqL7hE9JYNXno8vJi4A8x 4JxOwWjcI9GE+MOlv/bsFtD7N766PH3gTC8WEWe8= 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 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> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, open list , Sinan Kaya , Eric Dumazet , "open list:NETWORKING DRIVERS" , Tobias Klauser , "David S. Miller" , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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. 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;