From patchwork Fri Aug 17 23:36:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 178409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6402E2C009C for ; Sat, 18 Aug 2012 14:17:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754224Ab2HQXgH (ORCPT ); Fri, 17 Aug 2012 19:36:07 -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 S1752585Ab2HQXgG (ORCPT ); Fri, 17 Aug 2012 19:36:06 -0400 Received: by mail-ob0-f202.google.com with SMTP id wc20so3010724obb.1 for ; Fri, 17 Aug 2012 16:36:06 -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=cTnk/4vLAgs7NpFh0zWLIJr0ytiMXnuIIdxXASvbIkk=; b=MS2lKjZ+LP/aoHMnItLjWVDOcZYinTiFWH551nQ6i58Dn/1/IpmnTURmmgOUnIvxlC 7hzZuu/CIZSGJ62O+3bm3L2S9E8yjxM2WVLGIil9TEyq2xDpFSAVh3RU5e8x3dyrQJhY PuielmI2b3LTUr4Q4EdcWk019D50OPRpRfcia96F/ZW182brl7IKnEZCe4VKiVmXAX9u S/H1bwOoPO9zaj8zbrp2wtDDDVoLb4KXb0THyrFKp81Ghh2CWhtwMcjeMYFEbSBtVKDJ lnEdnsxCJT7yd0MN1QRN24fqnuIeDhSE0L/pRC+Loq+wQnZrU2mspT4RKInrybNY8UaV tVmQ== 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=cTnk/4vLAgs7NpFh0zWLIJr0ytiMXnuIIdxXASvbIkk=; b=joso8jKZDzrFNUWLgAaC/xtm031V0gXx9c1K2VSnhhUV0ekxE6WySVUhkMouXqTDX2 Wqw8kVi5mgAmmoEW9MLUhd5KW20jE0lgznR7WfNsjYmj4FdRltiqk4l0QLneD0S54QYh l1LpTtbhiuGnfuTIWRLmBMBRVF+u0xXFECiYOihR8ABBnIWio8NMeiyh9XpBvGdQ2KI7 ZXodaDvYUXtWujxeiM5sC0Svo3vM0FRCI6dZbW8g2snlaTwWt+ieqyB3TBWODmd1GXL8 QHL0GLv9zp/NGwfh5QAQzUWOIHCmbHQlFm7cJQAwmNxcAgg+SVy5Rk/Lqgt69iLbmKpk IU4g== Received: by 10.50.217.134 with SMTP id oy6mr1610722igc.5.1345246566459; Fri, 17 Aug 2012 16:36:06 -0700 (PDT) Received: by 10.50.217.134 with SMTP id oy6mr1610715igc.5.1345246566406; Fri, 17 Aug 2012 16:36:06 -0700 (PDT) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id xd1si1831268igb.1.2012.08.17.16.36.06 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 17 Aug 2012 16:36:06 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.18.96.155]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 07C1E100047; Fri, 17 Aug 2012 16:36:06 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id A23621801BB; Fri, 17 Aug 2012 16:36:05 -0700 (PDT) Subject: [PATCH v2 04/16] PCI: Don't export stop_bus_device and remove_bus_device interfaces 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:05 -0600 Message-ID: <20120817233605.10973.85918.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: ALoCoQnfZ2Jg4F/uz/e+3Og7Ydd7FOO5AH1C2fQ4vflTOvWZf5dYPIxAnvTC33GFkbgC8Wa++k+VWBu+9J9e20uZcOL95ZbbA9mB/U0LFrDDOXQ+aciCsAdhAJh0OvgqHsW3UgTGi+K34UdojU0EJE3I7Af4pwjfyJbqPlNVkf9DRioA7zfu16T4gTinIgBV1vDDURKFBQUxXzu/Jkp+ytszK7nu9SNiYA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The acpiphp hotplug driver was the only user of pci_stop_bus_device() and __pci_remove_bus_device(), and it now uses pci_stop_and_remove_bus_device() instead, so stop exposing these interfaces. This removes these exported symbols: __pci_remove_bus_device pci_stop_bus_device Signed-off-by: Bjorn Helgaas --- drivers/pci/remove.c | 8 ++++---- include/linux/pci.h | 2 -- 2 files changed, 4 insertions(+), 6 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 04a4861..534377f 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -79,6 +79,8 @@ void pci_remove_bus(struct pci_bus *pci_bus) EXPORT_SYMBOL(pci_remove_bus); static void __pci_remove_behind_bridge(struct pci_dev *dev); +static void pci_stop_bus_device(struct pci_dev *dev); + /** * pci_stop_and_remove_bus_device - remove a PCI device and any children * @dev: the device to remove @@ -91,7 +93,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev); * device lists, remove the /proc entry, and notify userspace * (/sbin/hotplug). */ -void __pci_remove_bus_device(struct pci_dev *dev) +static void __pci_remove_bus_device(struct pci_dev *dev) { if (dev->subordinate) { struct pci_bus *b = dev->subordinate; @@ -103,7 +105,6 @@ void __pci_remove_bus_device(struct pci_dev *dev) pci_destroy_dev(dev); } -EXPORT_SYMBOL(__pci_remove_bus_device); void pci_stop_and_remove_bus_device(struct pci_dev *dev) { @@ -170,7 +171,7 @@ static void pci_stop_bus_devices(struct pci_bus *bus) * and so on). This also stop any subordinate buses and children in a * depth-first manner. */ -void pci_stop_bus_device(struct pci_dev *dev) +static void pci_stop_bus_device(struct pci_dev *dev) { if (dev->subordinate) pci_stop_bus_devices(dev->subordinate); @@ -180,4 +181,3 @@ 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); -EXPORT_SYMBOL_GPL(pci_stop_bus_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 5faa831..54b5b2b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -734,9 +734,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); extern struct pci_dev *pci_dev_get(struct pci_dev *dev); extern void pci_dev_put(struct pci_dev *dev); extern void pci_remove_bus(struct pci_bus *b); -extern void __pci_remove_bus_device(struct pci_dev *dev); extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); -extern void pci_stop_bus_device(struct pci_dev *dev); void pci_setup_cardbus(struct pci_bus *bus); extern void pci_sort_breadthfirst(void); #define dev_is_pci(d) ((d)->bus == &pci_bus_type)