From patchwork Fri Nov 30 07:18:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1823821 Return-Path: X-Original-To: patchwork-linux-omap@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 CD019DF264 for ; Fri, 30 Nov 2012 07:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751226Ab2K3HSf (ORCPT ); Fri, 30 Nov 2012 02:18:35 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:41387 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970Ab2K3HSe (ORCPT ); Fri, 30 Nov 2012 02:18:34 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so103144dak.19 for ; Thu, 29 Nov 2012 23:18:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=tjz21dFrdm1X9QjQf2zY8ROgxws7EXaJVAyEQGVdU6s=; b=YygdjT9qsycSAgN0F/7X41GV5kKZlqQvGjKacf4S/HaZg8B6yUgrjOxoo5n7FHcgbt yADyJzLIHjXRxVReAZoAJjH+98xS1NkTJldKHPIdtpSRmDnGGONbJdiMwmQ6nFyhnTo0 97N/aGpZNeZaiQ8dRlql8EV/F17W2KNt5glCL0SvFK3IVCLMKYxwotlM58Gaw/uoHrI9 qTEjt/+gToPRFTyyzU1+1KqPZzE1tCQMKHwVO/XlOH6sq+PqQhwYosYAGJXLpS38rTQB o/5wKzP+w9JodU/70p5+1V3FHY1PWO+vz5tdneXT+Wb1A7mempO/TwGfDkpn078xw/ee GfpQ== Received: by 10.66.74.2 with SMTP id p2mr876583pav.55.1354259914115; Thu, 29 Nov 2012 23:18:34 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id d2sm2453823paw.19.2012.11.29.23.18.32 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Nov 2012 23:18:33 -0800 (PST) Date: Thu, 29 Nov 2012 23:18:33 -0800 From: Olof Johansson To: Tony Lindgren Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Igor Grinberg Subject: Re: [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Message-ID: <20121130071833.GD6899@quad.lixom.net> References: <50b41207.c188e50a.6d1e.ffffd469SMTPIN_ADDED_BROKEN@mx.google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50b41207.c188e50a.6d1e.ffffd469SMTPIN_ADDED_BROKEN@mx.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmycHYOK5tY7sglu4OmRFB61m7pg6shD9Vwheee3Bj75WZKEYcMDpXRp8tjIzHR15UN8uNN Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote: > The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9: > > Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed > > for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b: > > ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800) By the way, I had to apply the following fixup on top of this (in next/cleanup) to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER" from Igor. Also, add __init annotation to remove 12 section mismatches (and take off the explicit inline since __init + inline doesn't make sense -- the compiler should do the right thing anyway). -Olof From 73f14f6d007df1596da7cea9113084acfe846b8f Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 29 Nov 2012 23:05:32 -0800 Subject: [PATCH] ARM: omap: fix typo on timer cleanup Fix 32 vs 32k typo: arch/arm/mach-omap2/timer.c: In function 'omap4_local_timer_init': arch/arm/mach-omap2/timer.c:633:2: error: implicit declaration of function 'omap4_sync32_timer_init' [-Werror=implicit-function-declaration] arch/arm/mach-omap2/timer.c: At top level: arch/arm/mach-omap2/timer.c:610:2: warning: 'omap4_sync32k_timer_init' defined but not used [-Wunused-function] Also, mark the omap4_local_timer_init() stub as __init (and take off the explicit inline and let the compiler do the work instead). Signed-off-by: Olof Johansson Cc: Tony Lindgren Cc: Igor Grinberg --- arch/arm/mach-omap2/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b9cff72..7016637 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void) } } #else /* CONFIG_LOCAL_TIMERS */ -static inline void omap4_local_timer_init(void) +static void __init omap4_local_timer_init(void) { - omap4_sync32_timer_init(); + omap4_sync32k_timer_init(); } #endif /* CONFIG_LOCAL_TIMERS */ OMAP_SYS_TIMER(4, local);