From patchwork Wed Feb 26 09:11: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: 3722521 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 9BFDCBF13A for ; Wed, 26 Feb 2014 09:13:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA85E2018E for ; Wed, 26 Feb 2014 09:13:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB4082017B for ; Wed, 26 Feb 2014 09:12:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114AbaBZJMK (ORCPT ); Wed, 26 Feb 2014 04:12:10 -0500 Received: from mga01.intel.com ([192.55.52.88]:17712 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbaBZJMC (ORCPT ); Wed, 26 Feb 2014 04:12:02 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 26 Feb 2014 01:12:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,546,1389772800"; d="scan'208";a="488297918" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.21.187]) by fmsmga002.fm.intel.com with ESMTP; 26 Feb 2014 01:11:32 -0800 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: [RFC PATCH 7/8] Revert "ACPI / PNP: skip ACPI device nodes associated with physical nodes already" Date: Wed, 26 Feb 2014 17:11:13 +0800 Message-Id: <1393405874-3266-8-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393405874-3266-1-git-send-email-rui.zhang@intel.com> References: <1393405874-3266-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, 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 This reverts commit 2905875344f977acd188a2b0f1d163491e91459b. commit 2905875344f977acd188a2b0f1d163491e91459b was introduced to prevent PNP device objects from being created for ACPI device nodes already associated with platform devices. This is not needed any more because the platform device node won't be created if a device has already been attached to the PNPACPI scan handler. Plus, in some cases, we may need both PNP node and platform node for the same ACPI device object, on purpose, like what I will do in next patch. Thus reverting this commit. Signed-off-by: Zhang Rui --- drivers/pnp/pnpacpi/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 1ee7eb7..739fa24 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -524,10 +524,6 @@ static int __init pnpacpi_add_device(struct acpi_device *device) struct acpi_hardware_id *id; int error; - /* Skip devices that are already bound */ - if (device->physical_node_count) - return 0; - /* * If a PnPacpi device is not present , the device * driver should not be loaded.