Message ID | 1511328675-21981-27-git-send-email-okaya@codeaurora.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-pci-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="fI/2Ch3o"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Lw+C6NeF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhWMk5Wpjz9s76 for <incoming@patchwork.ozlabs.org>; Wed, 22 Nov 2017 16:33:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751977AbdKVFcr (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Wed, 22 Nov 2017 00:32:47 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:42070 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbdKVFco (ORCPT <rfc822; linux-pci@vger.kernel.org>); Wed, 22 Nov 2017 00:32:44 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DF24F609C3; Wed, 22 Nov 2017 05:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328764; bh=oQQOBmoRJXlCxr4mWcfgm/GpjW7JTm14hqZxM4ZFSn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fI/2Ch3oNXyWMl8O1alxCdy5epkoZrrSRG9ViV8PmaVJg6K05oOoaN+D7SmU0eUhW yqBxXwms6VM6evJlIO1uAVoyhzjN+b5SEFBH/9ybOOUrYV+X+36lmn2lkAFM3/4d8h zXkZhYgCdibbEW+Zho+3hkV1HQq2P/dhaUT99VUk= 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 147D46085C; Wed, 22 Nov 2017 05:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328755; bh=oQQOBmoRJXlCxr4mWcfgm/GpjW7JTm14hqZxM4ZFSn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lw+C6NeFgIzvxBCQUE0YPSUcd9AkL0Xg5phKmMdhpmVI2+mltZ8A11IWbIHmrXKhU obv3LbseDQwQxrcQXquO5mD7yF92eHFLTvQmmprHi0TJxw72MAt3BZ2pFKCoVEpW+y Ws6C6N0O/844kfDCpU7nHo18bqTGztaFvzE6W/bI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 147D46085C 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 <okaya@codeaurora.org> To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya <okaya@codeaurora.org>, Maik Broemme <mbroemme@libmpq.org>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, linux-fbdev@vger.kernel.org (open list:INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 26/30] video: fbdev: intelfb: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:11 -0500 Message-Id: <1511328675-21981-27-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: <linux-pci.vger.kernel.org> X-Mailing-List: linux-pci@vger.kernel.org |
Series |
PCI: deprecate pci_get_bus_and_slot()
|
expand
|
diff --git a/drivers/video/fbdev/intelfb/intelfbhw.c b/drivers/video/fbdev/intelfb/intelfbhw.c index d31ed4e..496c045 100644 --- a/drivers/video/fbdev/intelfb/intelfbhw.c +++ b/drivers/video/fbdev/intelfb/intelfbhw.c @@ -175,13 +175,15 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, { struct pci_dev *bridge_dev; u16 tmp; + u16 devfn; int stolen_overhead; if (!pdev || !aperture_size || !stolen_size) return 1; + devfn = PCI_DEVFN(0, 0); /* Find the bridge device. It is always 0:0.0 */ - if (!(bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)))) { + if (!(bridge_dev = pci_get_domain_bus_and_slot(0, 0, devfn))) { ERR_MSG("cannot find bridge device\n"); return 1; }
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 <okaya@codeaurora.org> --- drivers/video/fbdev/intelfb/intelfbhw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)