Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbaAGWvn (ORCPT ); Tue, 7 Jan 2014 17:51:43 -0500 Received: from denmail01-v4020.amcc.com ([192.195.68.30]:45736 "EHLO denmail01.apm.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754210AbaAGWvP (ORCPT ); Tue, 7 Jan 2014 17:51:15 -0500 From: Feng Kan To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Feng Kan Subject: [PATCH V2 4/6] power: reset: removed use of the dts mask and use fixed value for reset. Date: Tue, 7 Jan 2014 14:50:39 -0800 Message-Id: <1389135041-16062-5-git-send-email-fkan@apm.com> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1389135041-16062-1-git-send-email-fkan@apm.com> References: <1389135041-16062-1-git-send-email-fkan@apm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the use of the mask attribute in the X-Gene reboot driver and use fixed value. Signed-off-by: Feng Kan --- drivers/power/reset/xgene-reboot.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) 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; -- 1.7.6.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/