From patchwork Mon Nov 27 16:57:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 841763 X-Patchwork-Delegate: bhelgaas@google.com 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="TwDxaTCU"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="lDA1Xclj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yltQY3KHYz9s72 for ; Tue, 28 Nov 2017 04:02:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932314AbdK0Q74 (ORCPT ); Mon, 27 Nov 2017 11:59:56 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:32892 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932311AbdK0Q7x (ORCPT ); Mon, 27 Nov 2017 11:59:53 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E78806A641; Mon, 27 Nov 2017 16:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511801992; bh=czq6MQKGdnOfiaFvNVGXvFkAvS8ufm7whFv/esLQ+6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TwDxaTCUVUaFx6WHjQSb7PFmIRUKlA0Z9mPRN00YT5OYGjUXOmW+b10Z3sWtFkHST IpHKR+WsLHfXWJEpLsO/aZRl3CLsgsDSHSiWsiRei+RNI8EBU6+E8mYoGO67u330FR KVEaLANpg9RVZ48xWEt/AcoXML1I3r+xvNa4cPUk= 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 36AB06A4E5; Mon, 27 Nov 2017 16:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511801964; bh=czq6MQKGdnOfiaFvNVGXvFkAvS8ufm7whFv/esLQ+6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lDA1XcljCCnMnTyElmV6CdJcd7Mq3+w9j3j3seK+Bo7WW6Dy2xfAVinQC8WazlJqz dJeLD26QyCOuwPNfD21o4OZvxL7D0my9zq5JCM0N/mYj7dFKPoWWHAIFkYtvTeYuHo 1aFzTX74J/ftVRqBoezNs57eF1CA6YzlT5z8fe1s= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 36AB06A4E5 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, intel-gfx@lists.freedesktop.org, Sinan Kaya , Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox , Hans Verkuil , kbuild test robot , Dan Carpenter , Arnd Bergmann , Arushi Singhal , Avraham Shukron , Philippe Ombredanne , Valentin Vidic , linux-media@vger.kernel.org (open list:MEDIA INPUT INFRASTRUCTURE (V4L/DVB)), devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 22/29] [media] atomisp: deprecate pci_get_bus_and_slot() Date: Mon, 27 Nov 2017 11:57:59 -0500 Message-Id: <1511801886-6753-23-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511801886-6753-1-git-send-email-okaya@codeaurora.org> References: <1511801886-6753-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. Since ISP always uses domain 0, hard-code it in the code when calling the replacement function pci_get_domain_bus_and_slot(). Signed-off-by: Sinan Kaya --- drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | 2 +- drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c index 663aa91..95b9c7a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c @@ -1233,7 +1233,7 @@ static int atomisp_pci_probe(struct pci_dev *dev, isp->pdev = dev; isp->dev = &dev->dev; isp->sw_contex.power_state = ATOM_ISP_POWER_UP; - isp->pci_root = pci_get_bus_and_slot(0, 0); + isp->pci_root = pci_get_domain_bus_and_slot(0, 0, 0); if (!isp->pci_root) { dev_err(&dev->dev, "Unable to find PCI host\n"); return -ENODEV; diff --git a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c index 4631b1d..51dcef57 100644 --- a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c +++ b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c @@ -39,7 +39,7 @@ static inline int platform_is(u8 model) static int intel_mid_msgbus_init(void) { - pci_root = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); + pci_root = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); if (!pci_root) { pr_err("%s: Error: msgbus PCI handle NULL\n", __func__); return -ENODEV;