From patchwork Tue Dec 19 05:37:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122503 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 995C96057F for ; Tue, 19 Dec 2017 05:47:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8982C2904E for ; Tue, 19 Dec 2017 05:47:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E5EA2905A; Tue, 19 Dec 2017 05:47:54 +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 0E24D2904E for ; Tue, 19 Dec 2017 05:47:54 +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=+5HDmDhNj+q8jsA1HTkDCaufMawFW02NTED+Sxgn1aw=; b=tSFpl0vztllw6LJmZ+fcs4UKo+ M5y5C5XwwXcbzwUtmHGdtEPBoH+yQTisxhw2ugxjtrbSadKqOLI+yovo83wlWaEwJRZgBF44xi5j6 WF1C/rLhvtpwQm1os+vWhYYWxANdKoOgeEof9CeD/uEdclk9FH4KkQ+osUSDa5Dy9qzN9zB++AhjD IyPp0axe4zpgAxEXSq38X2/Xa0ehro6Y7SMQJCW05M9W8P5c3bzRD67MODqWk+jA1Vjt/l5jZ/MIv 41WU6Q+nvWY4rQOJ2HJ0atTDf4Wxv86vFBgiMsnvid7GH0m4YAeBYNG8CEGw+idQ1UZh2yUwySq4+ LS+Wvttw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eRAko-00049F-QN; Tue, 19 Dec 2017 05:47:50 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRAcv-0003oN-4i for linux-arm-kernel@lists.infradead.org; Tue, 19 Dec 2017 05:40:14 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9225160AFB; Tue, 19 Dec 2017 05:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661963; bh=aYU0QTS8dymmrB4G1JJa+ECOrfSN/Ca5DSzNvBKu5e4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cu53eJwr76SX6AdAL9iNeBLFSHbDRJryt2GL4zDSQq1KQEtkyLn0IKEeHiQ3xmzrQ L3UxOxfRgTvJ8GCeVxh5z1KJrQZEKrjUDoBQ5vhUHDAFD5VqH4sPlHe/VdNoM9AEUA O6GcuTEl/7r9nxJ4IaH9kNumb/W6kN+gXxQr/+0U= 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 652026047C; Tue, 19 Dec 2017 05:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661963; bh=aYU0QTS8dymmrB4G1JJa+ECOrfSN/Ca5DSzNvBKu5e4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cu53eJwr76SX6AdAL9iNeBLFSHbDRJryt2GL4zDSQq1KQEtkyLn0IKEeHiQ3xmzrQ L3UxOxfRgTvJ8GCeVxh5z1KJrQZEKrjUDoBQ5vhUHDAFD5VqH4sPlHe/VdNoM9AEUA O6GcuTEl/7r9nxJ4IaH9kNumb/W6kN+gXxQr/+0U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 652026047C 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 V4 16/26] PCI: ibmphp: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:52 -0500 Message-Id: <1513661883-28662-17-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171218_213941_552389_A0B6D550 X-CRM114-Status: GOOD ( 11.60 ) 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. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). Hard-coding the domain parameter as 0 since the code doesn't seem to be ready for multiple domains. 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");