From patchwork Fri Apr 12 15:44:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 236146 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 2586F2C00B5 for ; Sat, 13 Apr 2013 01:49:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757105Ab3DLPrf (ORCPT ); Fri, 12 Apr 2013 11:47:35 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:34687 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756987Ab3DLPrd (ORCPT ); Fri, 12 Apr 2013 11:47:33 -0400 Received: by mail-pb0-f53.google.com with SMTP id un15so1474062pbc.40 for ; Fri, 12 Apr 2013 08:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=97Sj8av8kmbYHxdS7jnq5eoc20TsAbzpjqHbIJLGwgo=; b=GlDeMG32sIyhaTAHVawEMbd1gyIsudNngtpZ9/NG21eOKSiZFP9Jnsx7De7Xi7b+FD Rl2D5bQVe9/eOS0neOCKVL9YqHRFNT3DWE01uiPqgBXlSVAfpLq40gF0VRL2//Ph1X6C TKg+bL71N5YbMvfgoGMB3Pizw8+FkD4yH+A+3v/E6MqYc6arY6Zk9WrsAqYjUdQTd/Rh g5lgH8rx9/58e+BxlL9E4lYC/ApOPkrMRkI9AyZPsc1eVsT8w18QHauH4Y+oFgKzXm8N lBxyIhmbDQUoHkrEZqLqucIKXNBk6Xrxw8/QCQ2K4UluEt3hd+B5vUnj6g0dbr5p0ow/ iEOA== X-Received: by 10.66.234.198 with SMTP id ug6mr3980864pac.43.1365781652524; Fri, 12 Apr 2013 08:47:32 -0700 (PDT) Received: from localhost.localdomain ([114.250.74.212]) by mx.google.com with ESMTPS id wz9sm9048741pbc.5.2013.04.12.08.47.26 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 08:47:31 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , "Rafael J . Wysocki" Cc: Jiang Liu , Yinghai Lu , Yijing Wang , Jiang Liu , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Greg Kroah-Hartman , ACPI Devel Maling List , Toshi Kani , Myron Stowe Subject: [PATCH v9 11/16] PCI/acpiphp: convert acpiphp as a builtin driver Date: Fri, 12 Apr 2013 23:44:25 +0800 Message-Id: <1365781470-32379-12-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365781470-32379-1-git-send-email-jiang.liu@huawei.com> References: <1365781470-32379-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Prepare for coming bugfixes by converting acpiphp as a builtin driver. This change has a drawback that user has no way to disable the acpiphp driver anymore once it becomes a builtin driver. We may introduce a kernel option to disable the acpiphp driver if needed. Signed-off-by: Jiang Liu --- drivers/pci/hotplug/Kconfig | 7 ++----- drivers/pci/hotplug/acpiphp_core.c | 10 ---------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 13e9e63..9fcb87f 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -52,15 +52,12 @@ config HOTPLUG_PCI_IBM When in doubt, say N. config HOTPLUG_PCI_ACPI - tristate "ACPI PCI Hotplug driver" - depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK) + bool "ACPI PCI Hotplug driver" + depends on HOTPLUG_PCI=y && ((!ACPI_DOCK && ACPI) || (ACPI_DOCK)) help Say Y here if you have a system that supports PCI Hotplug using ACPI. - To compile this driver as a module, choose M here: the - module will be called acpiphp. - When in doubt, say N. config HOTPLUG_PCI_ACPI_IBM diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index c2fd309..45312e5 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c @@ -364,14 +364,4 @@ static int __init acpiphp_init(void) } -static void __exit acpiphp_exit(void) -{ - if (acpi_pci_disabled) - return; - - /* deallocate internal data structures etc. */ - acpiphp_glue_exit(); -} - module_init(acpiphp_init); -module_exit(acpiphp_exit);