Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936775Ab3DICau (ORCPT ); Mon, 8 Apr 2013 22:30:50 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:52399 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934556Ab3DICa0 (ORCPT ); Mon, 8 Apr 2013 22:30:26 -0400 X-IronPort-AV: E=Sophos;i="4.87,434,1363158000"; d="scan'208";a="36904317" From: Stephen Boyd To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Mark Rutland , Marc Zyngier Subject: [PATCH 2/4] ARM: arch_timers: Pass clock event to set_mode callback Date: Mon, 8 Apr 2013 19:30:21 -0700 Message-Id: <1365474623-29181-3-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1365474623-29181-1-git-send-email-sboyd@codeaurora.org> References: <1365474623-29181-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1241 Lines: 32 There isn't any reason why we don't pass the event here and we'll need it in the near future for memory mapped arch timers anyway. Cc: Mark Rutland Cc: Marc Zyngier Signed-off-by: Stephen Boyd --- drivers/clocksource/arm_arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 2abb861..545891b 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -140,7 +140,7 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk) clk->cpumask = cpumask_of(smp_processor_id()); - clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, NULL); + clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, clk); clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- 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/