From patchwork Mon Feb 18 21:38:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2160301 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 181D6DF25A for ; Mon, 18 Feb 2013 20:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034Ab3BRUon (ORCPT ); Mon, 18 Feb 2013 15:44:43 -0500 Received: from mail-vc0-f178.google.com ([209.85.220.178]:60425 "EHLO mail-vc0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753494Ab3BRUon (ORCPT ); Mon, 18 Feb 2013 15:44:43 -0500 Received: by mail-vc0-f178.google.com with SMTP id m8so3859811vcd.9 for ; Mon, 18 Feb 2013 12:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Cf9gDIEYGLb/AY6CSoakyfnRQuJ5DdkzfN5csrIxtcY=; b=Otn1T7GUOK6Bej054+3UfC+ZuKTUMnnF807E47SXKHDjANpb5TU+p+n/fO6jet7gVt aHvsrMqhhYckhCcLE/5yHe/FQZs64c0iINU0EDv97daMf6MMTKptc9zAnUL5N9spRm5v zYeytzgl7KPQov5zwv2lH028Gk8JluWhHz5vxyh2Ylw4aFudYccpG5UGPpskOTqNM1T/ 90AGCNGEjtAM3O4jVBMZ0ABL2a6HG+zR3IwiZAoTM6bRX0THjsdJ/moW1C1/gLhmKd8B t4LTUIHmiDiLIc2bzflbjaL7hDmtFAgsB1nmzRLT30mqPQPSAkGgTG0M3RJ1GCfAwA86 RfPw== X-Received: by 10.58.117.229 with SMTP id kh5mr17958208veb.27.1361219893932; Mon, 18 Feb 2013 12:38:13 -0800 (PST) Received: from bender.routerdd3bcc.com (rrcs-50-74-208-202.nyc.biz.rr.com. [50.74.208.202]) by mx.google.com with ESMTPS id u20sm40893345vdt.4.2013.02.18.12.38.12 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 12:38:13 -0800 (PST) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman Subject: [PATCH] ARM: shmobile: Armadillo800EVA-reference: Remove usage of shmobile_timer Date: Mon, 18 Feb 2013 15:38:10 -0600 Message-Id: <1361223490-20106-1-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The struct sys_timer is gone since the patch "ARM: delete struct sys_timer". Since then we can't use shmobile_timer any longer. Setting .init_time directly to eva_earlytimer_init fixes the resulting compile error and makes the code shorter as well. Signed-off-by: Bastian Hecht --- .../board-armadillo800eva-reference.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 623754d..ae20979 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -219,14 +219,6 @@ static void __init eva_earlytimer_init(void) eva_clock_init(); } -static void __init eva_add_early_devices(void) -{ - r8a7740_add_early_devices_dt(); - - /* override timer setup with board-specific code */ - shmobile_timer.init = eva_earlytimer_init; -} - #define RESCNT2 IOMEM(0xe6188020) static void eva_restart(char mode, const char *cmd) { @@ -241,13 +233,13 @@ static const char *eva_boards_compat_dt[] __initdata = { DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference") .map_io = r8a7740_map_io, - .init_early = eva_add_early_devices, + .init_early = r8a7740_add_early_devices_dt, .init_irq = r8a7740_init_irq_of, .nr_irqs = NR_IRQS_LEGACY, .handle_irq = shmobile_handle_irq_intc, .init_machine = eva_init, .init_late = shmobile_init_late, - .init_time = shmobile_timer_init, + .init_time = eva_earlytimer_init, .dt_compat = eva_boards_compat_dt, .restart = eva_restart, MACHINE_END