From patchwork Sun Mar 16 17:03:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 3839621 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 26D48BF540 for ; Sun, 16 Mar 2014 17:06:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E97620200 for ; Sun, 16 Mar 2014 17:06:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77D0D20145 for ; Sun, 16 Mar 2014 17:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753155AbaCPRFS (ORCPT ); Sun, 16 Mar 2014 13:05:18 -0400 Received: from mga09.intel.com ([134.134.136.24]:59148 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932099AbaCPREK (ORCPT ); Sun, 16 Mar 2014 13:04:10 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 16 Mar 2014 09:59:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,665,1389772800"; d="scan'208";a="501094212" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.21.226]) by orsmga002.jf.intel.com with ESMTP; 16 Mar 2014 10:03:41 -0700 From: Zhang Rui To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bhelgaas@google.com, matthew.garrett@nebula.com, rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com, Zhang Rui Subject: [PATCH V3 07/11] ACPI: use platform bus as the default bus for _HID enumeration Date: Mon, 17 Mar 2014 01:03:13 +0800 Message-Id: <1394989397-2733-8-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394989397-2733-1-git-send-email-rui.zhang@intel.com> References: <1394989397-2733-1-git-send-email-rui.zhang@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because of the growing demand for enumerating ACPI devices to platform bus, this patch changes the code to enumerate ACPI devices with _HID to platform bus by default, unless the device already has a scan handler attached. Signed-off-by: Zhang Rui --- drivers/acpi/acpi_platform.c | 28 ---------------------------- drivers/acpi/scan.c | 12 ++++++------ 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index dbfe49e..33376a9 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -22,24 +22,6 @@ ACPI_MODULE_NAME("platform"); -/* - * The following ACPI IDs are known to be suitable for representing as - * platform devices. - */ -static const struct acpi_device_id acpi_platform_device_ids[] = { - - { "PNP0D40" }, - { "ACPI0003" }, - { "VPC2004" }, - { "BCM4752" }, - - /* Intel Smart Sound Technology */ - { "INT33C8" }, - { "80860F28" }, - - { } -}; - /** * acpi_create_platform_device - Create platform device for ACPI device node * @adev: ACPI device node to create a platform device for. @@ -125,13 +107,3 @@ int acpi_create_platform_device(struct acpi_device *adev, kfree(resources); return 1; } - -static struct acpi_scan_handler platform_handler = { - .ids = acpi_platform_device_ids, - .attach = acpi_create_platform_device, -}; - -void __init acpi_platform_init(void) -{ - acpi_scan_add_handler(&platform_handler); -} diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 58bdc03..f053d78 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2027,14 +2027,15 @@ static int acpi_scan_attach_handler(struct acpi_device *device) handler = acpi_scan_match_handler(hwid->id, &devid); if (handler) { ret = handler->attach(device, devid); - if (ret > 0) { + if (ret > 0) device->handler = handler; - break; - } else if (ret < 0) { - break; - } + if (ret) + goto end; } } +end: + if (device->pnp.type.platform_id && !device->handler) + acpi_create_platform_device(device, NULL); return ret; } @@ -2190,7 +2191,6 @@ int __init acpi_scan_init(void) acpi_pci_root_init(); acpi_pci_link_init(); acpi_processor_init(); - acpi_platform_init(); acpi_lpss_init(); acpi_cmos_rtc_init(); acpi_container_init();