From patchwork Mon Sep 22 07:42:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 4945881 Return-Path: X-Original-To: patchwork-linux-pm@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 85FF1BEEA5 for ; Mon, 22 Sep 2014 07:39:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B558420219 for ; Mon, 22 Sep 2014 07:39:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8A62201D3 for ; Mon, 22 Sep 2014 07:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753183AbaIVHjZ (ORCPT ); Mon, 22 Sep 2014 03:39:25 -0400 Received: from smtp77.ord1c.emailsrvr.com ([108.166.43.77]:47155 "EHLO smtp77.ord1c.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753181AbaIVHjY (ORCPT ); Mon, 22 Sep 2014 03:39:24 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp26.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id CFC5E3801B9; Mon, 22 Sep 2014 03:39:23 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp26.relay.ord1c.emailsrvr.com (Authenticated sender: pramod.gurav-AT-smartplayin.com) with ESMTPSA id 697C438018B; Mon, 22 Sep 2014 03:39:19 -0400 (EDT) X-Sender-Id: pramod.gurav@smartplayin.com Received: from SPINITLTDL00278.smartplayin.local ([UNAVAILABLE]. [220.227.185.53]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:465 (trex/5.2.10); Mon, 22 Sep 2014 07:39:23 GMT From: Pramod Gurav To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Pramod Gurav , Guenter Roeck , Josh Cartwright , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Stephen Boyd , linux-pm@vger.kernel.org Subject: [PATCH v2] power: reset: use restart_notifier mechanism for msm-poweroff Date: Mon, 22 Sep 2014 13:12:54 +0530 Message-Id: <1411371774-6834-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.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 change replaces use of arm_pm_restart with recently introduced reset mechanism in Linux kernel called restart_notifier. Cc: Guenter Roeck Cc: Josh Cartwright Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Cc: Stephen Boyd Cc: linux-pm@vger.kernel.org Signed-off-by: Pramod Gurav Reviewed-by: Guenter Roeck --- Tested on Dragonboard APQ8074 Changes since v1: - Initialized restart_nb with its declaration - Removed return check for register_restart_handler as it always returns 0 as per Guenter's suggestion to Josh's similar patch. This takes care of Guenter's comments on error logs and NULL initialization of restart_nb.notifier_call. drivers/power/reset/msm-poweroff.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 774f9a3..db73238 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -24,17 +24,24 @@ #include static void __iomem *msm_ps_hold; - -static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd) +static int do_msm_restart(struct notifier_block *nb, unsigned long action, + void *data) { writel(0, msm_ps_hold); mdelay(10000); + + return NOTIFY_DONE; } +static struct notifier_block restart_nb = { + .notifier_call = do_msm_restart, + .priority = 128, +}; + static void do_msm_poweroff(void) { /* TODO: Add poweroff capability */ - do_msm_restart(REBOOT_HARD, NULL); + do_msm_restart(&restart_nb, 0, NULL); } static int msm_restart_probe(struct platform_device *pdev) @@ -47,8 +54,10 @@ static int msm_restart_probe(struct platform_device *pdev) if (IS_ERR(msm_ps_hold)) return PTR_ERR(msm_ps_hold); + register_restart_handler(&restart_nb); + pm_power_off = do_msm_poweroff; - arm_pm_restart = do_msm_restart; + return 0; }