From patchwork Wed Nov 22 05:30:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069675 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 C6F536038F for ; Wed, 22 Nov 2017 05:36:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1D0428B18 for ; Wed, 22 Nov 2017 05:36:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6B9F297FE; Wed, 22 Nov 2017 05:36:17 +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 72CE428B18 for ; Wed, 22 Nov 2017 05:36:17 +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=911Nkg4n4gIcJk3baQGBKl49OE7Mps+waDMMUyI4BiQ=; b=dp9bWrzNFNGRnM4eHSf6okI0CP EasDA7/ux7V8fQbwXZCgpjAKVHJQqxKAiMEaxINdw8B0FBS+W0cImtMrbqFH5KidS6aqBIzSGW659 G3yoCTKmPHkXbpF9d8OSwK/xJQv67klT8G8rCeYM2ONBjhzyMYvxXmo9QW68WQ3iGyQqERbAtA9W4 fy9wdqPADsyPa3vfXWi5i0GY4JInSAzXwmN9GNrmxYRgjGsP4tv68vL8eOMMfFLB+d6ifOg2hDaP2 oaiK3x+uHBSPXOA75gdVofot6gEQwOFTEf7MWU8r6IFBQop7zvf8NelieUcQYV+IkNqNAQwVJbtGo 74U6aBTA==; 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 1eHNho-0001y3-U9; Wed, 22 Nov 2017 05:36:16 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNdw-0005mI-Pd for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:34 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2B5436085C; Wed, 22 Nov 2017 05:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328720; bh=uZ6/x1q4iSMewIJNdGyvoL4XnTC/aDqGi77cQw9kyC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SUMuxWmkYnKHjlG7nyhPKAKGunOQuFrHBspUdoe2Zd/kv0LubTU5VFh7kay56fLZc umS76H/sHwlXroxfgpkxrLVpq0JBSC9YrPOmhU2tv17aoms0EpCAhfa4TdY7g5h3RB Lv+3DyruKIEp4DUeY1Tssp0eu03/ruqx+HTRRJ4I= 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 A5EFE609A1; Wed, 22 Nov 2017 05:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328717; bh=uZ6/x1q4iSMewIJNdGyvoL4XnTC/aDqGi77cQw9kyC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BdmpOCoRSDmLYsGu4Wn/Me/qFe7SeLR2XWknQBfUFiinG03U1yNzYUhmFnofI2nMC Qk0/Xdznm3quTI74F8CrW2NEYRdLnU2nEjE9QRvGh43r8VE7t1w3+cIE0QRb9MAoD0 TlhHb0RmhBU4zghQts4RVThVavK5akEXpRNEtCiE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A5EFE609A1 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 12/30] Drivers: ide: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:30:57 -0500 Message-Id: <1511328675-21981-13-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_213217_484269_987C1D72 X-CRM114-Status: GOOD ( 10.05 ) 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 , "open list:IDE SUBSYSTEM" , "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/ide/sl82c105.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c index 8755df3..3300dac 100644 --- a/drivers/ide/sl82c105.c +++ b/drivers/ide/sl82c105.c @@ -239,8 +239,9 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) /* * The bridge should be part of the same device, but function 0. */ - bridge = pci_get_bus_and_slot(dev->bus->number, - PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); + bridge = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus), + dev->bus->number, + PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); if (!bridge) return -1;