Message ID | 1389135041-16062-5-git-send-email-fkan@apm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tuesday 07 January 2014, Feng Kan wrote: > @@ -73,8 +73,7 @@ static int xgene_reboot_probe(struct platform_device *pdev) > return -ENODEV; > } > > - if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask)) > - ctx->mask = 0xFFFFFFFF; > + ctx->mask = 0x1; Is the "mask" property now deprecated? Please update the binding document accordingly if it's no longer needed. Arnd
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c index ecd55f8..683238c 100644 --- a/drivers/power/reset/xgene-reboot.c +++ b/drivers/power/reset/xgene-reboot.c @@ -40,7 +40,7 @@ struct xgene_reboot_context { static struct xgene_reboot_context *xgene_restart_ctx; -static void xgene_restart(char str, const char *cmd) +static void xgene_restart(enum reboot_mode reboot_mode, const char *cmd) { struct xgene_reboot_context *ctx = xgene_restart_ctx; unsigned long timeout; @@ -73,8 +73,7 @@ static int xgene_reboot_probe(struct platform_device *pdev) return -ENODEV; } - if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask)) - ctx->mask = 0xFFFFFFFF; + ctx->mask = 0x1; ctx->pdev = pdev; arm_pm_restart = xgene_restart;
Remove the use of the mask attribute in the X-Gene reboot driver and use fixed value. Signed-off-by: Feng Kan <fkan@apm.com> --- drivers/power/reset/xgene-reboot.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)