From patchwork Sat Jul 19 20:38:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 371859 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 39C0314013B for ; Sun, 20 Jul 2014 06:20:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755780AbaGSUUC (ORCPT ); Sat, 19 Jul 2014 16:20:02 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:55436 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750805AbaGSUUB (ORCPT ); Sat, 19 Jul 2014 16:20:01 -0400 Received: from aepu139.neoplus.adsl.tpnet.pl [79.191.150.139] (HELO vostro.rjw.lan) by serwer1319399.home.pl [79.96.170.134] with SMTP (IdeaSmtpServer v0.80) id cb815ba618d7432a; Sat, 19 Jul 2014 22:19:59 +0200 From: "Rafael J. Wysocki" To: ACPI Devel Maling List Cc: Linux Kernel Mailing List , Linux PM list , Linux PCI , Zhang Rui , Peter Zijlstra Subject: [PATCH 2/2] ACPI / PM: Rename acpi_wakeup_device() to acpi_device_pm_event() Date: Sat, 19 Jul 2014 22:38:12 +0200 Message-ID: <11454851.tGNHnoC7c5@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1907495.agrCMfRsQN@vostro.rjw.lan> References: <1907495.agrCMfRsQN@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rafael J. Wysocki To avoid confusion with acpi_device_wakeup(), rename the default ACPI device PM notify handler from acpi_wakeup_device() to acpi_device_pm_event(). No functional changes. Signed-off-by: Rafael J. Wysocki --- drivers/acpi/device_pm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 Index: linux-pm/drivers/acpi/device_pm.c =================================================================== --- linux-pm.orig/drivers/acpi/device_pm.c +++ linux-pm/drivers/acpi/device_pm.c @@ -640,12 +640,12 @@ static int acpi_device_wakeup(struct acp #ifdef CONFIG_PM_RUNTIME /** - * acpi_wakeup_device - Wakeup notification handler for ACPI devices. + * acpi_device_pm_event - Wakeup notification handler for ACPI devices. * @handle: ACPI handle of the device the notification is for. * @event: Type of the signaled event. * @context: Device corresponding to @handle. */ -static void acpi_wakeup_device(acpi_handle handle, u32 event, void *context) +static void acpi_device_pm_event(acpi_handle handle, u32 event, void *context) { struct device *dev = context; @@ -680,7 +680,7 @@ int acpi_pm_device_run_wake(struct devic } EXPORT_SYMBOL(acpi_pm_device_run_wake); #else -static inline void acpi_wakeup_device(acpi_handle handle, u32 event, +static inline void acpi_device_pm_event(acpi_handle handle, u32 event, void *context) {} #endif /* CONFIG_PM_RUNTIME */ @@ -1036,7 +1036,7 @@ int acpi_dev_pm_attach(struct device *de if (dev->pm_domain) return -EEXIST; - acpi_add_pm_notifier(adev, acpi_wakeup_device, dev); + acpi_add_pm_notifier(adev, acpi_device_pm_event, dev); dev->pm_domain = &acpi_general_pm_domain; if (power_on) { acpi_dev_pm_full_power(adev); @@ -1064,7 +1064,7 @@ void acpi_dev_pm_detach(struct device *d if (adev && dev->pm_domain == &acpi_general_pm_domain) { dev->pm_domain = NULL; - acpi_remove_pm_notifier(adev, acpi_wakeup_device); + acpi_remove_pm_notifier(adev, acpi_device_pm_event); if (power_off) { /* * If the device's PM QoS resume latency limit or flags