Message ID | 1511328675-21981-27-git-send-email-okaya@codeaurora.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> 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 7987060353 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 06:34:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 709841FFDA for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 06:34:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63E72209D8; Wed, 22 Nov 2017 06:34:48 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C73AD29B9B for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 22 Nov 2017 06:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=q8c/fdmjN4AiTQbBaaTcM6y62t0od3BO+ny6tyz2Wd4=; b=hGUPTjMzDvrudrDTe9pe2Xq5qp dMF019OXUkkFJAWECsHg/he0gs0iPwk+6MbDysD6r1QT20c14NJ/dVuk2rzeHuPro4QDl/Co5BTq4 oOIPFLFq1igJjbbxoexKRSfqw7CxAV2mU9w/LU4nWukJgQnZKkCvgfh3is2LLFYFPYx7Pjt0x9GOn YyX5LzsHqQqydOF+1T9g+mum82KIjJHrY028l521oSlMhyTkWeaLaeK53cxApAsZxpHIMhKI5HQ9v 7aqQWqWhFYkGR31FC5oe93YwILFcMLM6FJNBfzCSQ9iFDzj/+IK5ni9d1DhEaTGEAZMpDuUdxM/3V XuQhLy7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eHOcR-0006Yo-9C; Wed, 22 Nov 2017 06:34:47 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHOc9-0006I2-8U for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 06:34:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dDmzZxq6HGcgZdBNtMTFFlUxb8E9nws36jcrXx+3VQw=; b=0kjTclFoJqi7IEwcDrJIzMNaz hri4TSmGizm7fhfEw5eCC3pWbMS1jbWM3PSoDfn8GRVU2puucZHpVZfe+GLhmluCvJ7KDTl6eLmGf bFpVdxeo0JpE1QF2HpoJc9F4tKMAT579r0qruPcGvzMM5y7qb0CTyOlzvMeXTmnJBnCn84b8+kXpD Wm/GQVA+0GD7JVa5idoBQWkRl1BO9Fwi5Z661wFWLkKdFP6bKNdlckpOvmbuEejqrhzLew1XTvT+o g+SXlF4+WqVCbLy+hJbWNh0j8o+CBzqTanjyXR7asYy2+V5UyPouSP1F9FC4jxXCBa8O0d7mvsAlv QiTd3ZAbw==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNed-0000ZZ-Lh for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:33:00 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5C75060C81; 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=1511328763; bh=oQQOBmoRJXlCxr4mWcfgm/GpjW7JTm14hqZxM4ZFSn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IO8zFrG23KMfTdIxTno6YyUYUxBX3vyxEd6JflRUUHLQ7FVKU+dr2Ho32qGntLW3R pUEAZc5GY8zzJHjfCuwAtFrBaRnTbI2uj1qDxVeZM9GZKyIFxCWxU8suF2VcXAKcwg MZfIIIivfIUAxn1KvhkMNa0aYSC2dZvHA2T0zTn0= 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 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> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: "open list:INTEL FRAMEBUFFER DRIVER excluding 810 and 815" <linux-fbdev@vger.kernel.org>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, linux-arm-msm@vger.kernel.org, Maik Broemme <mbroemme@libmpq.org>, open list <linux-kernel@vger.kernel.org>, Sinan Kaya <okaya@codeaurora.org>, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
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(-)