From patchwork Wed Nov 22 22:49:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 840589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="XT81h+8Z"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="ZS1uIMD1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhyVk02WMz9s71 for ; Thu, 23 Nov 2017 09:56:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753178AbdKVWuW (ORCPT ); Wed, 22 Nov 2017 17:50:22 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:43676 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753465AbdKVWuT (ORCPT ); Wed, 22 Nov 2017 17:50:19 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 318BD608D4; Wed, 22 Nov 2017 22:50:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511391018; bh=Nk2z8V4mkjuIYABr2Q9E/5hnEYT1KQFLa8d9gttMMB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT81h+8ZNaPWETIT38eMdIxmj3DYuvENBFyf6hwG9SQf0xL6OzXnw+zzzK1HPRDDe 1XYHevSAfpiYjKo98qz2jnZxf/tx5iBdHrPUNHOJZMm+6qANRrwsLpo7g9VfgQ+MF3 KmoazXugZ+/Vmrck6++QAquVg3tJfwpYx9qgeGBs= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 5E395609C1; Wed, 22 Nov 2017 22:50:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511391004; bh=Nk2z8V4mkjuIYABr2Q9E/5hnEYT1KQFLa8d9gttMMB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZS1uIMD1FFC7M/7xxVrg9cyzoOZbmpj+vCQsrWTiw3x1mRCHM7B1MBMMOKBveCYwF TTNcZCTsBtXAjOwglG93xgOj8Fw3ieeiElA/5iYqMPo13bFzhlGhD0shXRrzinVT3s 4qYWjuEnlgztAvyKQ4GepMi4OBDy+hkm2nmY6jHk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5E395609C1 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 V2 11/29] Drivers: ide: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 17:49:06 -0500 Message-Id: <1511390964-9979-12-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511390964-9979-1-git-send-email-okaya@codeaurora.org> References: <1511390964-9979-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 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 --- 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;