From patchwork Wed Nov 22 05:31:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069605 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 2EE366038F for ; Wed, 22 Nov 2017 05:33:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B84729B48 for ; Wed, 22 Nov 2017 05:33:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2066A29B4E; Wed, 22 Nov 2017 05:33:14 +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 D0F3E29B48 for ; Wed, 22 Nov 2017 05:33:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbdKVFcy (ORCPT ); Wed, 22 Nov 2017 00:32:54 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:42314 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbdKVFcv (ORCPT ); Wed, 22 Nov 2017 00:32:51 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3F6CA60C65; Wed, 22 Nov 2017 05:32:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328770; bh=6DIWa0lGWNAQSPJhLP8M+Z8Yl6m/bkNp3M32zp6E0s8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GrVGLyaFkebqXiGln/hKuOe4c0ntfHalrvEoPA76ixYVFWa/e5v9VxAPa/ZbDtMF9 IpvS8HG4EwjBcE3/AFT2BlXEDl7TtjqYWFd5Xqn2TX3okQ2HWPQ+0skISBbAfgLh/y 9dC54i2SotpaRBkwLNl9sh9HpZ+cTHgW3fyKkI+Y= 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 CB764609C3; Wed, 22 Nov 2017 05:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328762; bh=6DIWa0lGWNAQSPJhLP8M+Z8Yl6m/bkNp3M32zp6E0s8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cmA1/N/Leqpnkkfh+mkZb3ghRBe5+pJOCEGWzSM+P1agnVfEOPTjj23cPGMruakig 58fYs5O0RIJVm0HUTGF+uCycLWkEPtqlgSSh81v2sG9okMdZ9y/7yGXu8AlaUUrx5r oT8aZotO/Om/56DUagHiOS47KIsRJPTA256yApa0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CB764609C3 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 , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 30/30] PCI: remove pci_get_bus_and_slot() function Date: Wed, 22 Nov 2017 00:31:15 -0500 Message-Id: <1511328675-21981-31-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. Now that all users of pci_get_bus_and_slot() switched to pci_get_domain_bus_and_slot(), it is now safe to remove this function. Signed-off-by: Sinan Kaya --- include/linux/pci.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/linux/pci.h b/include/linux/pci.h index d16a7c0..8c1b650 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -957,11 +957,6 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus, unsigned int devfn); -static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, - unsigned int devfn) -{ - return pci_get_domain_bus_and_slot(0, bus, devfn); -} struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); int pci_dev_present(const struct pci_device_id *ids); @@ -1676,9 +1671,6 @@ static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from) static inline struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn) { return NULL; } -static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, - unsigned int devfn) -{ return NULL; } static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }