From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH v6 02/48] memory: emif: Use API function to determine power-off capability Date: Sun, 9 Nov 2014 17:42:19 -0800 Message-ID: <1415583785-6980-3-git-send-email-linux@roeck-us.net> References: <1415583785-6980-1-git-send-email-linux@roeck-us.net> Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:38846 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867AbaKJBnT (ORCPT ); Sun, 9 Nov 2014 20:43:19 -0500 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Xne0l-000TUC-Et for linux-pm@vger.kernel.org; Mon, 10 Nov 2014 01:43:19 +0000 In-Reply-To: <1415583785-6980-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , Santosh Shilimkar , Santosh Shilimkar Use have_kernel_power_off() to determine if the kernel is able to power off the system. Cc: Santosh Shilimkar Acked-by: Santosh Shilimkar Signed-off-by: Guenter Roeck --- v6: - No change. v5: - Rebase to v3.18-rc3 v4: - No change v3: - Replace poweroff in all newly introduced variables and in text with power_off or power-off as appropriate v2: - poweroff -> power_off drivers/memory/emif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 04644e7..317d49f 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -1053,10 +1053,10 @@ static irqreturn_t emif_threaded_isr(int irq, void *dev_id) dev_emerg(emif->dev, "SDRAM temperature exceeds operating limit.. Needs shut down!!!\n"); /* If we have Power OFF ability, use it, else try restarting */ - if (pm_power_off) { + if (have_kernel_power_off()) { kernel_power_off(); } else { - WARN(1, "FIXME: NO pm_power_off!!! trying restart\n"); + WARN(1, "FIXME: NO kernel power-off capability!!! trying restart\n"); kernel_restart("SDRAM Over-temp Emergency restart"); } return IRQ_HANDLED; -- 1.9.1