From patchwork Tue May 30 12:09:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100711 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp180816qge; Tue, 30 May 2017 05:12:12 -0700 (PDT) X-Received: by 10.98.95.68 with SMTP id t65mr23670261pfb.152.1496146332377; Tue, 30 May 2017 05:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496146332; cv=none; d=google.com; s=arc-20160816; b=z9XRfLum2ixyHIWKB3yM1amORGpT7OFEjsazNs8X8SFGaxq0JvAy5LxM/MJZCY+JK+ nPVjm7ddogAcuGYNynY+hvxiQM9ZG85zb3Mk2Q6/ccCuciJy+UmW1PG1iHVSQi+5AiB6 imA9ICjLChu21lYzp1joem/mTyRS6h+Fg2CrUTs1XSyi9a6P5qaQwno7aj5JtJSyDOFB yUkhC4CCQ+nRSwGASI4TxQsmyR9gCgg1wGmjeSSbk/BGTuj2Royjb5B+jQqXWElP0gAm p6k9ohpu7sMpciklBMw7XWApB02tS07+MnvkqZxPgJYK1sRxcfQMbuFI1qGCARKN0oB1 gbFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=ANWbkGW8HLJDmwyDOEb8Tf0vPFF0kvlr95Ip6PymI58=; b=oE4kQwBZUhTSpng1PIoQJ6jnOk1TOWOliteTVf7BpsBXAAMOH6lkC9TGW9rQ4a1NzE tZuWsxIvxaeEdDP0evQZKL5rSGoN4TOVAR3IMnBSihlyli3IIsyCAh2hbMnQVfywJ0QJ UvdViQrs10vzRhUTMxz6uI1fAsGBtk1W2CPkdhVc6B2l7skaicB1BhuKul1U8yjRWvDi rfpDna2zRtRdgAqu/3RQiRxnyAaiT3/exjjc+MddXAb8KN9h3KFKkghD/9Z7rgguunrV UrIKIIrLzk67F5MRE96Zpf0ZDtCL9P4kdHOW7GJjHCbZ9diZCCYpwqFcOhZhh2Y1joQP WW3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6si13509157pfb.286.2017.05.30.05.12.12; Tue, 30 May 2017 05:12:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751220AbdE3ML6 (ORCPT + 25 others); Tue, 30 May 2017 08:11:58 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:37077 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750902AbdE3ML5 (ORCPT ); Tue, 30 May 2017 08:11:57 -0400 Received: by mail-wm0-f42.google.com with SMTP id d127so95355838wmf.0 for ; Tue, 30 May 2017 05:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ANWbkGW8HLJDmwyDOEb8Tf0vPFF0kvlr95Ip6PymI58=; b=LPTgtJ1vfGsBsn9yt+Mq3JVHVZBY/QndGp+4nEG+zVCZWRADH6B6UZwGfqt5xGLpzC v+yGQAb5rd9xB+zlgPew1Y1hWrcrf4G86OGsI82Ox4DToYPGfJfqbLTHXElA+DtUBisf k/B20qJMiXNvE7Uxw002my6VUlAwpESqcQzzE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ANWbkGW8HLJDmwyDOEb8Tf0vPFF0kvlr95Ip6PymI58=; b=CGnnXaWoazBy6XIrTEs7XCve7Qr2vPjT98B7XD2i2HeWd+6vB62HwfmbOXvBAS2aBk eV2tAmxoZ3CLmDtFpdQpsTWU3Eu+upY5GeNMc7+FUiyg99hds+wurrAxMDY1wTqx/AwD z6NpB/K3RlexE5ryVsoTmdxPSZ3cEI5yWWhA5iDdenQhuBIs0Q2zvcPtnT0Bw8WRdAAn o5CSPCVtgujkDI4KFtwWD8QsIO9eAOxOMqSFYmCgkdDW6xSdOIxf5GwLX2gSmho9uvEa K5w5h/TopY+BSAlVn5+7xPsdt2O19NfD3xRxxn7B6sq5jj34wo71lRErlGEM9cLrUlMk hYZA== X-Gm-Message-State: AODbwcDJHyPZNB/q+B11pBvmmQzpcz/tO0rZ95y/eWAtUn61Hn/yA5Nj mofk1ANGuMfJ00z+ X-Received: by 10.223.160.240 with SMTP id n45mr16479663wrn.198.1496146315952; Tue, 30 May 2017 05:11:55 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:3e97:eff:fe5b:1402]) by smtp.gmail.com with ESMTPSA id w96sm12955549wrc.14.2017.05.30.05.11.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 May 2017 05:11:55 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: Arnd Bergman , John Stultz , Stephen Boyd , linux-kernel@vger.kernel.org (open list:TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER) Subject: [PATCH] clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE Date: Tue, 30 May 2017 14:09:10 +0200 Message-Id: <1496146150-6892-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The macro CLOCKSOURCE_OF_DECLARE has been rename to TIMER_OF_DECLARE. In order to prevent conflicts for the next merge window, a temporary alias has been added which will be removed later. Cc: Arnd Bergman Signed-off-by: Daniel Lezcano --- include/linux/clocksource.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index c48ceef..d92bd83 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -252,6 +252,9 @@ extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1_RET(timer, name, compat, fn) +#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ + TIMER_OF_DECLARE(name, compat, fn) + #ifdef CONFIG_TIMER_PROBE extern void timer_probe(void); #else