From patchwork Tue Oct 7 05:28:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5042141 Return-Path: X-Original-To: patchwork-linux-sh@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 271D9C11AD for ; Tue, 7 Oct 2014 05:34:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58BA82010C for ; Tue, 7 Oct 2014 05:34:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C1C82018E for ; Tue, 7 Oct 2014 05:34:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbaJGFdh (ORCPT ); Tue, 7 Oct 2014 01:33:37 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:42063 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbaJGFcX (ORCPT ); Tue, 7 Oct 2014 01:32:23 -0400 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=C9K3YgqJ4LXgPWVvhs0AhDdLB8r7RvJvTt8ntj/ReaA=; b=6bIFiT4kIR8fv4v/XnRM/zfLAJLcYn33VmnbkvHkcrb5hWH9j12bu38T5T1dtEP0cBCHpl9rWgM/5Doo/JinjPGkFI/4u74qbRPFE3oLDFZFPdt6A1ZNva4Um1TOXgRbZwohE7pgGTMEPIzXSc6vSisHbZhRaX97opfLiF8YvrU=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNNn-002owt-9G for linux-sh@vger.kernel.org; Tue, 07 Oct 2014 05:32:23 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:32947 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1XbNMC-002hqy-J6; Tue, 07 Oct 2014 05:30:45 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: adi-buildroot-devel@lists.sourceforge.net, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, lguest@lists.ozlabs.org, linux-acpi@vger.kernel.org, linux-alpha@vger.kernel.org, linux-am33-list@redhat.com, linux-cris-kernel@axis.com, linux-efi@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-m32r-ja@ml.linux-m32r.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-tegra@vger.kernel.org, linux-xtensa@linux-xtensa.org, openipmi-developer@lists.sourceforge.net, user-mode-linux-devel@lists.sourceforge.net, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linux-pm@vger.kernel.org, linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org, Guenter Roeck , "Rafael J. Wysocki" , Pavel Machek , Len Brown Subject: [PATCH 44/44] kernel: Remove pm_power_off Date: Mon, 6 Oct 2014 22:28:46 -0700 Message-Id: <1412659726-29957-45-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=2.6 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, TVD_SUBJ_WIPE_DEBT, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY,URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-CTCH-PVer: 0000001 X-CTCH-Spam: Suspect X-CTCH-VOD: Unknown X-CTCH-Flags: 512 X-CTCH-RefID: str=0001.0A020203.54337AE7.007D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=512, sb=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 1411 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 220 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-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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 Signed-off-by: Guenter Roeck --- include/linux/pm.h | 1 - kernel/power/poweroff_handler.c | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/linux/pm.h b/include/linux/pm.h index 45271b5..fce7645 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); /* diff --git a/kernel/power/poweroff_handler.c b/kernel/power/poweroff_handler.c index 96f59ef..01a3a39 100644 --- a/kernel/power/poweroff_handler.c +++ b/kernel/power/poweroff_handler.c @@ -20,12 +20,6 @@ #include /* - * If set, calling this function will power off the system immediately. - */ -void (*pm_power_off)(void); -EXPORT_SYMBOL(pm_power_off); - -/* * Notifier list for kernel code which wants to be called * to power off the system. */ @@ -163,8 +157,6 @@ int register_poweroff_handler_simple(void (*handler)(void), int priority) */ void do_kernel_poweroff(void) { - if (pm_power_off) - pm_power_off(); atomic_notifier_call_chain(&poweroff_handler_list, 0, NULL); } @@ -175,6 +167,6 @@ void do_kernel_poweroff(void) */ bool have_kernel_poweroff(void) { - return pm_power_off != NULL || poweroff_handler_list.head != NULL; + return poweroff_handler_list.head != NULL; } EXPORT_SYMBOL(have_kernel_poweroff);