From patchwork Thu Jun 28 18:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10494827 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 DA01460325 for ; Thu, 28 Jun 2018 19:06:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDF722A1F2 for ; Thu, 28 Jun 2018 19:06:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1D532A189; Thu, 28 Jun 2018 19:06:39 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 72F4B2A189 for ; Thu, 28 Jun 2018 19:06:39 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=8My+osC4fqJN+b0ErQcTN4EhBdVr2W0twrI5DNSNQ/o=; b=LxuctC4qq8Lm9E DbV1wVzqoOzG40RsASZ0mPXRr1zgRH/yeO0BNozQpzEecX7tyBgNFWTvL2ajQbnunVne9+iUtQMBh si8QegYTG1sJnJWjoKTbNz72FV/9hheq6BSjwHsTP9wzLawG0ryWNiBrjbTQWbbaHtXkl3DV4QlL3 ADjk888o52T7lTdg16ZbI/rmh5DjypYgU86CGebnhr6YfbeQjI1MdsAhA/RzBT0yUopnZw3ATdoOH 0g2p5B2svl9tbRySIiXa0gD/m0t+Pj2tjZSIuwblQf1mIL+OLOv5TnvSxQ3R7yn9LbQH0n5N3sxcb ukSeJr7QUG9cb32EjhZQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYcFS-0000sy-8F; Thu, 28 Jun 2018 19:06:30 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYcEU-000091-9Q for linux-arm-kernel@bombadil.infradead.org; Thu, 28 Jun 2018 19:05:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type: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=oXyc1YIdkWobhivtyGLQuav3mHJirb7GQkNT3//mmcY=; b=woZeYPzuQfvXmuTek0IYbeedls hxbBUticRD11mkvIXtyDHriwkDxW+9ZQU3yfwkdjG4jLM+yqwxdRKgXmMWX++EfinZ5cwvgl6ZY+m CMhrs1OhIi/5T499/GjobuUfluy9mBbMKlYDlvEWKkVgFpOe2J2zm0VcvwGAhMLob2OFEdHXwhrIu t5BxBUrth5p5x58XIoxI+SIc/DutdLudbf4BripmnHDn/8k8+QIgPOg8tmm6U90Yx3xCsBEcOd6xx bf1Zmwf++DbuQ2qUnToeH12fI01AO0sXWzWzgLF0Dt102lIcmsDwYlgSU7Y3vX4ELqVTrmISJ4cky 830s4wLQ==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYbgi-0000Jk-Gg for linux-arm-kernel@lists.infradead.org; Thu, 28 Jun 2018 18:30:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A82AC60B7B; Thu, 28 Jun 2018 18:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530210621; bh=yzowvntBUDaV3G8x809xkVFE3DgfPOtCfmXvwSKbs14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYo29XAtOGgH4uNwOyrhunzX7Hyoq/n8Ty7lrVAc48/FmjsNteSzYzAN16xgXGqaN BnzPcXcP11o+O0Ma4+Z7jIalXApG/DvwSQpnDZZKK0sG9Rc62uc7y7wDP5D8MYE1sc 4aIu0XDnJz98chn5p4WBfzJI1yl7hIm56hYkckTw= 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 81F8460C6C; Thu, 28 Jun 2018 18:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530210586; bh=yzowvntBUDaV3G8x809xkVFE3DgfPOtCfmXvwSKbs14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=odqHzjk2pL8FUWcU7JrS/Rmn4g4cA95R7e0kyA0Fa4db54ZgC2tCGUkE7LIFQj+OH AMFs4pSAPvipErvpQeYR4zd34nKyqxoZt4/uFPHayrD9yvdkIFA75oEs8PWo5U/sWK rWlNbjrS6KeqDLREjauy9d9Qx67Iwinvj4QnmPaI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 81F8460C6C 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 Subject: [PATCH V3 4/6] PCI: Deprecate pci_reset_bus() and pci_reset_slot() functions Date: Thu, 28 Jun 2018 14:28:24 -0400 Message-Id: <1530210507-9287-4-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530210507-9287-1-git-send-email-okaya@codeaurora.org> References: <1530210507-9287-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180628_143036_678973_CB6C0172 X-CRM114-Status: GOOD ( 14.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sinan Kaya , linux-arm-msm@vger.kernel.org, Bjorn Helgaas , open list , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP pci_reset_bus() and pci_reset_slot() functions are not being used by any code. Remove them from the kernel in favor of pci_try_reset_bus() and pci_try_reset_slot() functions. Signed-off-by: Sinan Kaya --- drivers/pci/pci.c | 55 ++--------------------------------------------------- include/linux/pci.h | 2 -- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 79a1566..6cec722 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4784,9 +4784,9 @@ int pci_probe_reset_slot(struct pci_slot *slot) EXPORT_SYMBOL_GPL(pci_probe_reset_slot); /** - * pci_reset_slot - reset a PCI slot + * __pci_try_reset_slot - Try to reset a PCI slot * @slot: PCI slot to reset - * + *` * A PCI bus may host multiple slots, each slot may support a reset mechanism * independent of other slots. For instance, some slots may support slot power * control. In the case of a 1:1 bus to slot architecture, this function may @@ -4796,30 +4796,6 @@ EXPORT_SYMBOL_GPL(pci_probe_reset_slot); * through this function. PCI config space of all devices in the slot and * behind the slot is saved before and restored after reset. * - * Return 0 on success, non-zero on error. - */ -int pci_reset_slot(struct pci_slot *slot) -{ - int rc; - - rc = pci_slot_reset(slot, 1); - if (rc) - return rc; - - pci_slot_save_and_disable(slot); - - rc = pci_slot_reset(slot, 0); - - pci_slot_restore(slot); - - return rc; -} -EXPORT_SYMBOL_GPL(pci_reset_slot); - -/** - * __pci_try_reset_slot - Try to reset a PCI slot - * @slot: PCI slot to reset - * * Same as above except return -EAGAIN if the slot cannot be locked */ static int __pci_try_reset_slot(struct pci_slot *slot) @@ -4878,33 +4854,6 @@ int pci_probe_reset_bus(struct pci_bus *bus) EXPORT_SYMBOL_GPL(pci_probe_reset_bus); /** - * pci_reset_bus - reset a PCI bus - * @bus: top level PCI bus to reset - * - * Do a bus reset on the given bus and any subordinate buses, saving - * and restoring state of all devices. - * - * Return 0 on success, non-zero on error. - */ -int pci_reset_bus(struct pci_bus *bus) -{ - int rc; - - rc = pci_bus_reset(bus, 1); - if (rc) - return rc; - - pci_bus_save_and_disable(bus); - - rc = pci_bus_reset(bus, 0); - - pci_bus_restore(bus); - - return rc; -} -EXPORT_SYMBOL_GPL(pci_reset_bus); - -/** * __pci_try_reset_bus - Try to reset a PCI bus * @bus: top level PCI bus to reset * diff --git a/include/linux/pci.h b/include/linux/pci.h index f5c85b6..ad0c89a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1095,9 +1095,7 @@ int pci_reset_function(struct pci_dev *dev); int pci_reset_function_locked(struct pci_dev *dev); int pci_try_reset_function(struct pci_dev *dev); int pci_probe_reset_slot(struct pci_slot *slot); -int pci_reset_slot(struct pci_slot *slot); int pci_probe_reset_bus(struct pci_bus *bus); -int pci_reset_bus(struct pci_bus *bus); int pci_try_reset_bus(struct pci_dev *dev); void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev);