From patchwork Fri Aug 17 23:35:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1340071 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 D5CEA3FC81 for ; Fri, 17 Aug 2012 23:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753493Ab2HQXf5 (ORCPT ); Fri, 17 Aug 2012 19:35:57 -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 S1753297Ab2HQXf4 (ORCPT ); Fri, 17 Aug 2012 19:35:56 -0400 Received: by mail-ob0-f202.google.com with SMTP id wc20so3010724obb.1 for ; Fri, 17 Aug 2012 16:35:56 -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=4jw5tHVWPc+2Gre3ZwPRjKHerVqQyPAus+X/P0LBw8E=; b=AjDE/YTch6BWDlQoC6HHupo5X9Dp7riRePvaDw6x9+dj8ystdySIQK/smpaB8xfEqJ kUCa5DejOW0juu8SDdkSm4BMuFVzKzpyQwhHE9LgYd+8+detiDLcjDm62h6pZKbc2a1y +pcH/kKhm18LQTWsx6xYzKecCHrGOXBFWtif+kag8318aWX8LEeOH4bt6NwmnbqUiqQt S4ir48y+YUE7hZvtLj6eKSHM8fa/wGuJONDQDn35K+vGa45Hv8ZamaPwrLNga4JvBs9D BWeZWUulF3tuq1m3LNiH8ZWNhmpHxdJwT2uxtRzzR8I51f5hbi5zu/U8hMuqBeoRBmxb zpQA== 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=4jw5tHVWPc+2Gre3ZwPRjKHerVqQyPAus+X/P0LBw8E=; b=NN7sUbhJSpprMF8P9B6fa5s61xJ0LZvC5yRm4wx75bNKEnFlvWZ/tRwbVjLpjAqLOG 37gNTP6pqROHLdXFqhyiK1HhUNRXJCIeE9DL9SyAA/4OCyoUs3y1SsebCF4p9/GMDhex Mms2YyhVS7xy+kpKGkwXF9r8hTvR3UaOt60LZ3dD7sgVOK5Zfa7H4NiF6QS0J5Xg4sS6 0w0p9eHOaC/k960+rBHEa682QlZ8NPUHaBXnpiFldIHDZoNn1Y01mse67yIda+LJmU4q fVhuWHzbfrxxoCK1Ij2NpHuPRT+USpesKlkDLofYuYvdrKOumtXbI89b4KnNDFerWUNI xEdQ== Received: by 10.42.127.211 with SMTP id j19mr2497559ics.16.1345246555937; Fri, 17 Aug 2012 16:35:55 -0700 (PDT) Received: by 10.42.127.211 with SMTP id j19mr2497553ics.16.1345246555894; Fri, 17 Aug 2012 16:35:55 -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 xd1si1831012igb.1.2012.08.17.16.35.55 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 17 Aug 2012 16:35:55 -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 7F6D6100047; Fri, 17 Aug 2012 16:35:55 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id 2AE2C1801BB; Fri, 17 Aug 2012 16:35:55 -0700 (PDT) Subject: [PATCH v2 02/16] PCI: acpiphp: Use common pci_stop_and_remove_bus_device() 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:35:55 -0600 Message-ID: <20120817233555.10973.75372.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: ALoCoQmYLIuNAroSPUVUKoO3GGex8MXDFDRhV/17VR+MjYxf3wpfJEfeayOnRuvYT0885T0x28lS/XoFT2jRVeXgrhuhAaT8CY9tKg7UpoqCnvFvQGjzNCO4WBWAZb+59ox0mzYtpnIhzk3ILMgGM5GkeKy5h8Q639N+E4GMl5pgHGK8cAE4ZEhyKFf61WBRwl5gtsyRgurl4OrwbccO/JBmlGf9Oc8JNA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use pci_stop_and_remove_bus_device() like most other hotplug drivers rather than stopping and removing separately. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/acpiphp_glue.c | 3 +-- 1 files changed, 1 insertions(+), 2 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/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index c25291c..b5d798e 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -920,8 +920,7 @@ static int disable_device(struct acpiphp_slot *slot) * here. */ while ((pdev = dev_in_slot(slot))) { - pci_stop_bus_device(pdev); - __pci_remove_bus_device(pdev); + pci_stop_and_remove_bus_device(pdev); pci_dev_put(pdev); }