From patchwork Wed Nov 22 05:31:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069659 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 51A046038F for ; Wed, 22 Nov 2017 05:35:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DF9029660 for ; Wed, 22 Nov 2017 05:35:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42FE32978D; Wed, 22 Nov 2017 05:35:15 +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 0008329660 for ; Wed, 22 Nov 2017 05:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbdKVFc2 (ORCPT ); Wed, 22 Nov 2017 00:32:28 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:40414 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751702AbdKVFc0 (ORCPT ); Wed, 22 Nov 2017 00:32:26 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3A92C60ADC; Wed, 22 Nov 2017 05:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328746; bh=dDxFCNB4fR1smM6rusv7fO6WRfv4HjxDxuAmjMGA1rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kaUNAUFO11rW960bXd3jdPXKMJdlJO97LzzGj4X0j7HROtE8SaRxFKSRCLOVxXzsd /vay1kYpV2ZWZiowTaLuB7AKdcVUGG6BoGv2Dxj+UaDBu2xDvzPCkZphgsaT9kqqxt ccJhkavKFbBCccMKlz7MRH4lNpiGtaaO7KmSi+s8= 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 E8E6F60ADC; Wed, 22 Nov 2017 05:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328738; bh=dDxFCNB4fR1smM6rusv7fO6WRfv4HjxDxuAmjMGA1rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGRb35MZYsCoSkz5quhmczvHsF9WQ9CMm9Ir4D7dvU/9AJe9DHnpfFF62FAN5evG3 iSdSZEd2ft2fSDDzaE7911rhP03lqXZ2DAff0oKaWcwPDEQU4GcxODZJvoCgXqlIvQ PHvXGQhDm1hqS8Wo5/7UXNyXbDrzkrBZ6M24QzU0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E8E6F60ADC 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" , sparclinux@vger.kernel.org (open list:SPARC + UltraSPARC (sparc/sparc64)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 22/30] openprom: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:07 -0500 Message-Id: <1511328675-21981-23-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> 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. 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/sbus/char/openprom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 2c2e6a3..7b31f19 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -251,8 +251,9 @@ static int oprompci2node(void __user *argp, struct device_node *dp, struct openp struct pci_dev *pdev; struct device_node *dp; - pdev = pci_get_bus_and_slot (((int *) op->oprom_array)[0], - ((int *) op->oprom_array)[1]); + pdev = pci_get_domain_bus_and_slot(0, + ((int *) op->oprom_array)[0], + ((int *) op->oprom_array)[1]); dp = pci_device_to_OF_node(pdev); data->current_node = dp;