From patchwork Wed Nov 22 05:31:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069713 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 4723D6038F for ; Wed, 22 Nov 2017 05:37:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41BC6286A8 for ; Wed, 22 Nov 2017 05:37:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 369E7296C4; Wed, 22 Nov 2017 05:37:45 +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 37AA728B18 for ; Wed, 22 Nov 2017 05:37:44 +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=U2ii20X4byGWQ/8/3UJVRiwF8JjSumJm+zzymbYsQzM=; b=l/9JVt7l7Fg92hyo4hWIGJyNLy y+uGma2OjN++hu9b7Kbkkp5ciA1LzlGHjyGhcXYDUV+7k8JcCSyBG9gZXvqlRyIFLM0+rt96LIXIJ YaSq8cSU6zDbK5xhyb3CFaZKwE6I3siOfjoZkHMi70EsYGHvUPP2Ht1qEPaJyrGfavbGUbeV7oFfF feJ0b9/GEzL9xg2biKb+grYyuLKn1zy7/i96rOkTz6LpRLAlJ7qPdkLSjxdxQln/xVrvoSPqMBm80 wXpjQe7vXv47JjpDpflwwDcGJ6wVW2uRgUjoJJkij6CMBOo0dHT2r2wbh3Red/dRLp0GmmxNzkiih olBa3pyQ==; 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 1eHNj4-00033g-9q; Wed, 22 Nov 2017 05:37:34 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNeL-00069R-PU for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:33:25 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2B26660ACD; Wed, 22 Nov 2017 05:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328742; bh=cLES1TbWr/1cMHNEVmVvDlsv2/ce2S3zMMfDoAgwHdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pu/SqDpJrEWUJJ2MVmcqu7BtMx1bFU/SEOwZQpWTePae5ZtJKRm1EeuTTchSBQ1wQ NDvf1bbMIEZoN+jWPukGtdVuk1L25LDodS9QR7FlgF2fwa6U52mrBwnJXAXPOnVjaZ fCNjmCc4D/iOHH3GCBMWS6Ozr3r9+Qlqyn/MoAzA= 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 81EC86087F; Wed, 22 Nov 2017 05:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328731; bh=cLES1TbWr/1cMHNEVmVvDlsv2/ce2S3zMMfDoAgwHdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2BotQHAaAxPpGY6VfwY6TnQIHfp4oJ8aOPK9ia4Q5cjd3arstovwDWLmW59K8ZXB uxlYOX7CLqI0bk5rUNBqLL/KW5zk17s+XurBssM55LdfgV1Rhc71qv6K4LlHF53w8Y JEyCfO7FHI5dvTh5oreyEkHjH0Y8DYAAzBiMTEB0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 81EC86087F 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 18/30] PCI: ibmphp: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:03 -0500 Message-Id: <1511328675-21981-19-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171121_213242_563431_38C71BA7 X-CRM114-Status: GOOD ( 10.52 ) 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 , Bjorn Helgaas , Arvind Yadav , 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/pci/hotplug/ibmphp_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 73cf846..92dd882 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c @@ -707,7 +707,8 @@ static void ibm_unconfigure_device(struct pci_func *func) pci_lock_rescan_remove(); for (j = 0; j < 0x08; j++) { - temp = pci_get_bus_and_slot(func->busno, (func->device << 3) | j); + temp = pci_get_domain_bus_and_slot(0, func->busno, + (func->device << 3) | j); if (temp) { pci_stop_and_remove_bus_device(temp); pci_dev_put(temp); @@ -780,7 +781,7 @@ static int ibm_configure_device(struct pci_func *func) if (!(bus_structure_fixup(func->busno))) flag = 1; if (func->dev == NULL) - func->dev = pci_get_bus_and_slot(func->busno, + func->dev = pci_get_domain_bus_and_slot(0, func->busno, PCI_DEVFN(func->device, func->function)); if (func->dev == NULL) { @@ -793,7 +794,7 @@ static int ibm_configure_device(struct pci_func *func) if (num) pci_bus_add_devices(bus); - func->dev = pci_get_bus_and_slot(func->busno, + func->dev = pci_get_domain_bus_and_slot(0, func->busno, PCI_DEVFN(func->device, func->function)); if (func->dev == NULL) { err("ERROR... : pci_dev still NULL\n");