Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932275AbaJUEU3 (ORCPT ); Tue, 21 Oct 2014 00:20:29 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:33789 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754522AbaJUEOT (ORCPT ); Tue, 21 Oct 2014 00:14:19 -0400 From: Guenter Roeck To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , David Woodhouse , Dmitry Eremin-Solenikov , Sebastian Reichel Subject: [PATCH v2 29/47] power/reset: ltc2952-poweroff: Register with kernel poweroff handler Date: Mon, 20 Oct 2014 21:12:45 -0700 Message-Id: <1413864783-3271-30-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413864783-3271-1-git-send-email-linux@roeck-us.net> References: <1413864783-3271-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A02020A.5445DD9B.00B6,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.000 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: 158 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Register with kernel poweroff handler instead of setting pm_power_off directly. Register with low priority to reflect that the original code sets pm_power_off only if it was not already set. Signed-off-by: Guenter Roeck --- v2: Added patch drivers/power/reset/ltc2952-poweroff.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c index 116a1ce..da9abd2 100644 --- a/drivers/power/reset/ltc2952-poweroff.c +++ b/drivers/power/reset/ltc2952-poweroff.c @@ -80,6 +80,8 @@ struct ltc2952_poweroff_data { * 2: kill */ struct gpio_desc *gpio[3]; + + struct notifier_block poweroff_nb; }; static int ltc2952_poweroff_panic; @@ -180,9 +182,13 @@ irq_ok: return IRQ_HANDLED; } -static void ltc2952_poweroff_kill(void) +static int ltc2952_poweroff_kill(struct notifier_block *this, + unsigned long unused1, void *unused2) + { gpiod_set_value(ltc2952_data->gpio[POWERPATH_IO_KILL], 1); + + return NOTIFY_DONE; } static int ltc2952_poweroff_suspend(struct platform_device *pdev, @@ -285,12 +291,7 @@ err_io: static int ltc2952_poweroff_probe(struct platform_device *pdev) { - int ret; - - if (pm_power_off) { - dev_err(&pdev->dev, "pm_power_off already registered"); - return -EBUSY; - } + int i, ret; ltc2952_data = kzalloc(sizeof(*ltc2952_data), GFP_KERNEL); if (!ltc2952_data) @@ -302,12 +303,20 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev) if (ret) goto err; - pm_power_off = <c2952_poweroff_kill; + ltc2952_data->poweroff_nb.notifier_call = ltc2952_poweroff_kill; + ltc2952_data->poweroff_nb.priority = POWEROFF_PRIORITY_LOW; + ret = register_power_off_handler(<c2952_data->poweroff_nb); + if (ret) + goto err_power; dev_info(&pdev->dev, "probe successful\n"); return 0; +err_power: + free_irq(ltc2952_data->virq, ltc2952_data); + for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++) + gpiod_put(ltc2952_data->gpio[i]); err: kfree(ltc2952_data); return ret; @@ -317,7 +326,7 @@ static int ltc2952_poweroff_remove(struct platform_device *pdev) { unsigned int i; - pm_power_off = NULL; + unregister_power_off_handler(<c2952_data->poweroff_nb); if (ltc2952_data) { free_irq(ltc2952_data->virq, ltc2952_data); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/