From patchwork Tue Dec 19 05:37:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122457 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 C724060390 for ; Tue, 19 Dec 2017 05:44:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9D9F29042 for ; Tue, 19 Dec 2017 05:44:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AED852905A; Tue, 19 Dec 2017 05:44:09 +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 7325F29042 for ; Tue, 19 Dec 2017 05:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760934AbdLSFjR (ORCPT ); Tue, 19 Dec 2017 00:39:17 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:54980 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760910AbdLSFjK (ORCPT ); Tue, 19 Dec 2017 00:39:10 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4C3CF60B14; Tue, 19 Dec 2017 05:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661950; bh=Nk2z8V4mkjuIYABr2Q9E/5hnEYT1KQFLa8d9gttMMB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jVUyOx9I5n8inihf0N2za+LufKFqpxQnJOvno8OTBSVir1rygdHH8jkZzoMVviYSJ ToR7aVrAuH6xshc7s9Ym6vHIm9zDj2zwjyrqm5EiqkG3/BW5I1SIPrsKFl9OcfdrXf SeI7J6TBFVkPeWv/Bv/fiz5uoByhV1SYMedYldG0= 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 07A316070B; Tue, 19 Dec 2017 05:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661949; bh=Nk2z8V4mkjuIYABr2Q9E/5hnEYT1KQFLa8d9gttMMB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cyJBvrCDVOuy4ktiA+DJsvd+cwv+keDEs9FxQ6BIxnwz1VwFZ0hXpuWBhE88qa2/J yh9saWTno002Aalr/o69d3cD0hAYA2Nus1rBcjw1lnadcQxDYZ1qBN4tNsaoYTYwiW luaAHar2s+dPU1b00H7wXaHGz3/vSUr/yiPhRAW8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 07A316070B 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" , linux-ide@vger.kernel.org (open list:IDE SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 10/26] Drivers: ide: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:46 -0500 Message-Id: <1513661883-28662-11-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(). Replace pci_get_bus_and_slot() with pci_get_domain_bus_and_slot() and extract the domain number from struct pci_dev. Signed-off-by: Sinan Kaya Acked-by: David S. Miller --- 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;