From patchwork Mon Nov 10 01:43:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5262861 Return-Path: X-Original-To: patchwork-linux-pm@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 C40219F295 for ; Mon, 10 Nov 2014 01:45:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E799420176 for ; Mon, 10 Nov 2014 01:45:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACEBF20173 for ; Mon, 10 Nov 2014 01:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752797AbaKJBpX (ORCPT ); Sun, 9 Nov 2014 20:45:23 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:39315 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752795AbaKJBpW (ORCPT ); Sun, 9 Nov 2014 20:45:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=rKojpHcWKF8bSkJq+OEI2ZiYvle3qbaHeVMnxue6sKM=; b=vFcUtsVuh8Y6oZnzug+6/9S78dOT+ZbaN3/FTYa416vioKIRrcrEusmUNibOlA6zPDlESERqpEfAHaCN8TrQomfv36uBTD249ehshVubZZ3eL+LO/MuEjMiXe7LX/6NoSxw57sCBGEHidnhNZsVG1Q1oGAWSoIlx1RuNmmwfMXE=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne2k-000XiZ-5k for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:45:22 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:36340 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Xne2i-000XhS-Rb; Mon, 10 Nov 2014 01:45:21 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , "Rafael J. Wysocki" , Pavel Machek , Len Brown Subject: [PATCH v6 48/48] kernel: Remove pm_power_off Date: Sun, 9 Nov 2014 17:43:05 -0800 Message-Id: <1415583785-6980-49-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415583785-6980-1-git-send-email-linux@roeck-us.net> References: <1415583785-6980-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=1.3 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,TVD_SUBJ_WIPE_DEBT,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A02020A.546018B2.0045, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 277 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No users of pm_power_off are left, so it is safe to remove the function. Cc: Rafael J. Wysocki Cc: Pavel Machek Cc: Len Brown Acked-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Guenter Roeck --- v6: - No change. v5: - Rebase to v3.18-rc3 v4: - Do not use notifiers but internal functions and data structures to manage the list of power-off handlers. Drop unused parameters from callbacks, and make the power-off function type void v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate v2: - poweroff -> power_off for API functions include/linux/pm.h | 1 - kernel/power/power_off_handler.c | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/include/linux/pm.h b/include/linux/pm.h index 1d2298b..3bdade8 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -31,7 +31,6 @@ /* * Callbacks for platform drivers to implement. */ -extern void (*pm_power_off)(void); extern void (*pm_power_off_prepare)(void); struct device; /* we have a circular dep with device.h */ diff --git a/kernel/power/power_off_handler.c b/kernel/power/power_off_handler.c index d80a337..c89d47b 100644 --- a/kernel/power/power_off_handler.c +++ b/kernel/power/power_off_handler.c @@ -23,12 +23,6 @@ #include /* - * If set, calling this function will power off the system immediately. - */ -void (*pm_power_off)(void); -EXPORT_SYMBOL(pm_power_off); - -/* * List of handlers for kernel code which wants to be called * to power off the system. */ @@ -296,10 +290,6 @@ void do_kernel_power_off(void) * removed while the call chain is traversed, but we'll have to accept * that risk. */ - - if (pm_power_off) - pm_power_off(); - p = rcu_dereference_raw(power_off_handler_list); while (p) { next_p = rcu_dereference_raw(p->next); @@ -315,7 +305,6 @@ void do_kernel_power_off(void) */ bool have_kernel_power_off(void) { - return pm_power_off != NULL || - rcu_dereference_raw(power_off_handler_list) != NULL; + return rcu_dereference_raw(power_off_handler_list) != NULL; } EXPORT_SYMBOL(have_kernel_power_off);