All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org,
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
	Loc Ho <lho@apm.com>
Subject: [PATCH 06/10] power/reset: xgene: Register with kernel restart handler
Date: Fri, 26 Sep 2014 17:57:14 -0700	[thread overview]
Message-ID: <1411779438-23127-7-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1411779438-23127-1-git-send-email-linux@roeck-us.net>

Register with kernel restart handler instead of setting arm_pm_restart directly.

This patch also addresses the following compile warning.

drivers/power/reset/xgene-reboot.c: In function 'xgene_reboot_probe':
drivers/power/reset/xgene-reboot.c:77:17: warning:
	assignment from incompatible pointer type [enabled by default]

The warning was due to a mismatch between the type of arm_pm_restart
and the restart function.

Cc: Loc Ho <lho@apm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/power/reset/xgene-reboot.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index ae470b8..1e7f5f5 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -26,32 +26,36 @@
  */
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/notifier.h>
 #include <linux/of_device.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
+#include <linux/reboot.h>
 #include <linux/stat.h>
 #include <linux/slab.h>
-#include <asm/system_misc.h>
 
 struct xgene_reboot_context {
 	struct device *dev;
 	void *csr;
 	u32 mask;
+	struct notifier_block restart_handler;
 };
 
-static struct xgene_reboot_context *xgene_restart_ctx;
-
-static void xgene_restart(char str, const char *cmd)
+static int xgene_restart_handler(struct notifier_block *this,
+				 unsigned long mode, void *cmd)
 {
-	struct xgene_reboot_context *ctx = xgene_restart_ctx;
+	struct xgene_reboot_context *ctx =
+		container_of(this, struct xgene_reboot_context,
+			     restart_handler);
 
 	/* Issue the reboot */
-	if (ctx)
-		writel(ctx->mask, ctx->csr);
+	writel(ctx->mask, ctx->csr);
 
 	mdelay(1000);
 
 	dev_emerg(ctx->dev, "Unable to restart system\n");
+
+	return NOTIFY_DONE;
 }
 
 static int xgene_reboot_probe(struct platform_device *pdev)
@@ -73,8 +77,11 @@ static int xgene_reboot_probe(struct platform_device *pdev)
 		ctx->mask = 0xFFFFFFFF;
 
 	ctx->dev = dev;
-	arm_pm_restart = xgene_restart;
-	xgene_restart_ctx = ctx;
+	ctx->restart_handler.notifier_call = xgene_restart_handler;
+	ctx->restart_handler.priority = 128;
+	err = register_restart_handler(&ctx->restart_handler);
+	if (err)
+		dev_err(dev, "cannot register restart handler (err=%d)\n", err);
 
 	return 0;
 }
-- 
1.9.1


  parent reply	other threads:[~2014-09-27  0:57 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-27  0:57 [PATCH 00/10] power/reset: Register drivers with restart handler Guenter Roeck
2014-09-27  0:57 ` [PATCH 01/10] power/reset: vexpress: Register with kernel " Guenter Roeck
2014-09-27  0:57 ` [PATCH 02/10] power/reset: xgene: Return -ENOMEM if out of memory Guenter Roeck
2014-09-27  0:57 ` [PATCH 03/10] power/reset: xgene: Drop devm_kfree Guenter Roeck
2014-09-27  0:57 ` [PATCH 04/10] power/reset: xgene: Use local variable dev instead of pdev->dev Guenter Roeck
2014-09-27  0:57 ` [PATCH 05/10] power/reset: xgene: Use mdelay instead of jiffies based timeout Guenter Roeck
2014-09-27  0:57 ` Guenter Roeck [this message]
2014-09-27  0:57 ` [PATCH 07/10] power/reset: axxia: Register with kernel restart handler Guenter Roeck
2014-09-29  8:40   ` Anders Berg
2014-09-27  0:57 ` [PATCH 08/10] power/reset: keystone: " Guenter Roeck
2014-09-28 22:57   ` Santosh Shilimkar
2014-09-29 13:53   ` Ivan Khoronzhuk
2014-09-29 13:53     ` Ivan Khoronzhuk
2014-09-29 15:11     ` Guenter Roeck
2014-09-27  0:57 ` [PATCH 09/10] power/reset: hisi: " Guenter Roeck
2014-09-27  0:57 ` [PATCH 10/10] power/reset: brcmstb: " Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411779438-23127-7-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=dbaryshkov@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=lho@apm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=santosh.shilimkar@ti.com \
    --cc=sre@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.