From patchwork Fri Aug 17 23:36:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1340101 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F253E3FC81 for ; Fri, 17 Aug 2012 23:36:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755067Ab2HQXgN (ORCPT ); Fri, 17 Aug 2012 19:36:13 -0400 Received: from mail-ob0-f202.google.com ([209.85.214.202]:34062 "EHLO mail-ob0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585Ab2HQXgL (ORCPT ); Fri, 17 Aug 2012 19:36:11 -0400 Received: by mail-ob0-f202.google.com with SMTP id wc20so3010724obb.1 for ; Fri, 17 Aug 2012 16:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=2K3k0Vh2lzez3P9WCuoAGFqIfbJJY3shuG6FP0hSAq8=; b=dHCfUyD+2wI4sG1P7RNfGc5A/cxGG6u+lQCQwfFEJhGHJFrlFmMELvugUTL0rf2Dq5 +pyk68aXnOwdyeYGbjbRSQn1P7nBdQL8RX6M47UBHfkSz3uT8GZbwyMZ7Y9qtPI22xhz /m3ydVCY1+AhVVsJQIUIPxktHkq+0B9TNTBYfvfoAFibVNpyY0TjWkHG0Uic+5/TfPCY ICRLNq0UiqM1BFJPt3PaJ49dlxXPDvh8wP1BVMQfyICdbXRYr9IfGXS7XtS06TVijHsS m6QSg6vyTmF4lo3BV6s++HrTcQB7iv2yLjW4fZxccnM2TRv+oXmyHQunESsTLHPRSGZU jqhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=2K3k0Vh2lzez3P9WCuoAGFqIfbJJY3shuG6FP0hSAq8=; b=BSl45uWch4Mf03MJElrt7QCTUz4jFjw8r89YvpDXV30u4+BUOCyzJK3Rpd2AytDwWP 68xEPqWhf/4BGKIjzJe9UdCC87u1tJKk8BZQ9cPVbyF6buXoOp/3E+0yycNDR92KcD6u UC6soyeFOVasJ/yTviykyLLpxFX9jOQnr5n2DBmXLRulR/aFaYqdzIsd5S89tqdVu31b hvJmXtF44CPBOgpzG5+3c/suxdjb0w4qRfx8fNOnfxihpnaB0ldfHDa1m2dkqG5Oj+vr h0iKjIHBzGC1Kwsjz9aZnc2PLHgO/Mp+ag/riOfaOMzDRqwKB/FF1B3ihmOQLqTdwscL XLZg== Received: by 10.42.57.79 with SMTP id c15mr2631868ich.33.1345246571614; Fri, 17 Aug 2012 16:36:11 -0700 (PDT) Received: by 10.42.57.79 with SMTP id c15mr2631857ich.33.1345246571529; Fri, 17 Aug 2012 16:36:11 -0700 (PDT) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id ad4si1823654igc.1.2012.08.17.16.36.11 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 17 Aug 2012 16:36:11 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.18.96.155]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 276921E0043; Fri, 17 Aug 2012 16:36:11 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id C75AD1801BB; Fri, 17 Aug 2012 16:36:10 -0700 (PDT) Subject: [PATCH v2 05/16] PCI: Remove pci_stop_and_remove_behind_bridge() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-pcmcia@lists.infradead.org, Yinghai Lu , Kenji Kaneshige Date: Fri, 17 Aug 2012 17:36:10 -0600 Message-ID: <20120817233610.10973.25669.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20120817233100.10973.59521.stgit@bhelgaas.mtv.corp.google.com> References: <20120817233100.10973.59521.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnw1W0GstHYhEc89ftDK/0kE6mTX9V5+eWBCCFMIFQDpNc4NSDh8VVKKjldzXDzNIhj5rdsmTDtBSY8vPQTN/dQqXsEr7w6DPcd0ralJvUt//OLQpR2imsRq4vA3p2srN+gOAqgQlwZFuuuQkk0iw/5jIbX7Y+vYrIJRRGx1hh4liXuYut0P+yf0479YTLjTg3wP+liIoiPuLZ2kljilZaNlvKsRA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The PCMCIA CardBus driver was the only user of pci_stop_and_remove_behind_bridge(), and it now uses pci_stop_and_remove_bus_device() instead, so remove this interface. This removes exported symbol pci_stop_and_remove_behind_bridge. Signed-off-by: Bjorn Helgaas --- drivers/pci/remove.c | 25 ------------------------- include/linux/pci.h | 1 - 2 files changed, 0 insertions(+), 26 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 534377f..b18dc2e 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -121,30 +121,6 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev) __pci_remove_bus_device(pci_dev_b(l)); } -static void pci_stop_behind_bridge(struct pci_dev *dev) -{ - struct list_head *l, *n; - - if (dev->subordinate) - list_for_each_safe(l, n, &dev->subordinate->devices) - pci_stop_bus_device(pci_dev_b(l)); -} - -/** - * pci_stop_and_remove_behind_bridge - stop and remove all devices behind - * a PCI bridge - * @dev: PCI bridge device - * - * Remove all devices on the bus, except for the parent bridge. - * This also removes any child buses, and any devices they may - * contain in a depth-first manner. - */ -void pci_stop_and_remove_behind_bridge(struct pci_dev *dev) -{ - pci_stop_behind_bridge(dev); - __pci_remove_behind_bridge(dev); -} - static void pci_stop_bus_devices(struct pci_bus *bus) { struct list_head *l, *n; @@ -180,4 +156,3 @@ static void pci_stop_bus_device(struct pci_dev *dev) } EXPORT_SYMBOL(pci_stop_and_remove_bus_device); -EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); diff --git a/include/linux/pci.h b/include/linux/pci.h index 54b5b2b..1dce47c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1011,7 +1011,6 @@ void pci_unregister_driver(struct pci_driver *dev); module_driver(__pci_driver, pci_register_driver, \ pci_unregister_driver) -void pci_stop_and_remove_behind_bridge(struct pci_dev *dev); struct pci_driver *pci_dev_driver(const struct pci_dev *dev); int pci_add_dynid(struct pci_driver *drv, unsigned int vendor, unsigned int device,