From patchwork Tue Dec 19 05:37:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 850594 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="WeLpeoWI"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Aw2F6U0E"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z16DF34fvz9t0m for ; Tue, 19 Dec 2017 16:39:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761002AbdLSFji (ORCPT ); Tue, 19 Dec 2017 00:39:38 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56016 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760988AbdLSFjf (ORCPT ); Tue, 19 Dec 2017 00:39:35 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A1B6F60B17; Tue, 19 Dec 2017 05:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661974; bh=SeH061RS0w/xf6xnprE+WI8tkIceKPKMneWoiUuqmdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WeLpeoWIOraQPlb/puJ9gsVbbvmFicXziOJPZg7gaZx0ucY0KaKU4zaI8UuPR/r89 Wm6llKZ2QmUl9pLDt+TomPjpxX07rHmj+222oSpH6AITp4/8zuMPkVdWEGdIbc/kXJ Gp76nL/80YEVWdjrgeuBCYzGROSqtVFfKPiqs9zo= 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 DECBF60B1F; Tue, 19 Dec 2017 05:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661973; bh=SeH061RS0w/xf6xnprE+WI8tkIceKPKMneWoiUuqmdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aw2F6U0EtZnB8Had7nIR/pnQUa0lTrNslT1Z9R240nBphX6XAgblq8Zdtk0JBMNHb sNbNI91hni2jl/172HO92gVkRQW1OPSPN4FcoaXe8Np0TPAgJgL38A18NtVEzL5mGi vSwcdV7JZaeeKsA6JMdo4xpOakS7Mfk0LbCx4NWY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DECBF60B1F 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 , Maik Broemme , Bartlomiej Zolnierkiewicz , linux-fbdev@vger.kernel.org (open list:INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)), dri-devel@lists.freedesktop.org (open list:FRAMEBUFFER LAYER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 22/26] video: fbdev: intelfb: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:58 -0500 Message-Id: <1513661883-28662-23-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 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(). Find the domain number from pdev. Signed-off-by: Sinan Kaya Acked-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/intelfb/intelfbhw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/intelfb/intelfbhw.c b/drivers/video/fbdev/intelfb/intelfbhw.c index 83fec57..57aff74 100644 --- a/drivers/video/fbdev/intelfb/intelfbhw.c +++ b/drivers/video/fbdev/intelfb/intelfbhw.c @@ -181,7 +181,9 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, return 1; /* Find the bridge device. It is always 0:0.0 */ - if (!(bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)))) { + bridge_dev = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), 0, + PCI_DEVFN(0, 0)); + if (!bridge_dev) { ERR_MSG("cannot find bridge device\n"); return 1; }