From patchwork Sat Jan 18 02:48:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 3507891 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 64A629F169 for ; Sat, 18 Jan 2014 02:53:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A9612018B for ; Sat, 18 Jan 2014 02:53:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAC8020165 for ; Sat, 18 Jan 2014 02:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752961AbaARCxH (ORCPT ); Fri, 17 Jan 2014 21:53:07 -0500 Received: from mga03.intel.com ([143.182.124.21]:30609 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592AbaARCxG (ORCPT ); Fri, 17 Jan 2014 21:53:06 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 17 Jan 2014 18:53:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,677,1384329600"; d="scan'208";a="460784151" Received: from gerry-dev.bj.intel.com ([10.238.158.74]) by fmsmga001.fm.intel.com with ESMTP; 17 Jan 2014 18:48:01 -0800 From: Jiang Liu To: "Rafael J . Wysocki" , Bjorn Helgaas , Toshi Kani , Yinghai Lu , Yijing Wang , Len Brown , "Rafael J. Wysocki" , Robert Moore , Lv Zheng Cc: Jiang Liu , linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, devel@acpica.org Subject: [Patch v1 3/3] ACPI: kill field 'ignore' in acpi_hotplug_profile Date: Sat, 18 Jan 2014 10:48:17 +0800 Message-Id: <1390013297-23462-3-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390013297-23462-1-git-send-email-jiang.liu@linux.intel.com> References: <1390013297-23462-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.2 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 Field 'ignore' in acpi_hotplug_profile is introduced by "ca499fc87ed945 ACPI / hotplug: Fix conflicted PCI bridge notify handlers" to support PCI host bridge hotplug. Now it's useless, so kill it. Signed-off-by: Jiang Liu --- drivers/acpi/scan.c | 2 +- include/acpi/acpi_bus.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index d83e0ff..b932ae6 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1776,7 +1776,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type) */ list_for_each_entry(hwid, &pnp.ids, list) { handler = acpi_scan_match_handler(hwid->id, NULL); - if (handler && !handler->hotplug.ignore) { + if (handler) { acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, acpi_hotplug_notify_cb, handler); break; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 09a73bd..d1f6ebd 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -100,7 +100,6 @@ enum acpi_hotplug_mode { struct acpi_hotplug_profile { struct kobject kobj; bool enabled:1; - bool ignore:1; enum acpi_hotplug_mode mode; };