From patchwork Wed Jun 14 12:39:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 105509 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp272657qgd; Wed, 14 Jun 2017 05:44:13 -0700 (PDT) X-Received: by 10.84.239.23 with SMTP id w23mr503572plk.73.1497444253002; Wed, 14 Jun 2017 05:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497444252; cv=none; d=google.com; s=arc-20160816; b=Kqla+zoKtYYY26bQSOHPuZIJIBG7zIi8/bGm18JR/0dHgqqqCGkspC3Z4qUPwXNfVm 3x+1OWLE5hMO4U5WT9dOYIcDBl5LM+igqEgdp4irDgsnwd/i6pcXIrxyBGzGJmSiIaqn FhiGZlwkOXO+wuy/GF92LEd3+WActCjPugichJAGx7P/X04CSleAwSKJ8PE5BKzxQ6N2 +/30V3PqQCVzWOShavDSWySL8OTx7XBc97sek+DwWPZUcv/GkUvASRsXKqRTghn/iSkv j15FzVdK0wICSdtsxspfzvYUtfP7uGNsoeKa9oq/sGi8Pk8uMOQ7a/T8xg8W6331ux5z Xsgg== 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=j7zElijAKmZH+7e1+A+LvdVb0Z1SEgkG6A9gEYcjQ2uXYpMoDsB5OdrtoJmnof8tHj xZ4pozC5hDmK90Mfsd9ViB9gOah/IenV9w2Vana5DBwinCO06nKeRCq/hLpGX+h8rF9N F66EyAOxuCKCdtIGkUMBwHSbPQFMwGE9q1lCUsaMLdJV/eo4pE6IRMrgkjg4Vdoar0r1 nuuCCTt+j2blLgSDjVvQJ/qc1tbdDExw9WyAuJDtL4jwFUKiGp43h1q95nYl0xPFXoUK siwUIuQTkh/PGP7oPjBkfC3uH0XR7C6TzW2+iHKPga+zpdaWFc0O+SjdI6fUhwy31EpB ZRug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=EJ8Glsbj; 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 f3si630208plb.182.2017.06.14.05.44.12; Wed, 14 Jun 2017 05:44: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 header.b=EJ8Glsbj; 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 S1752793AbdFNMoA (ORCPT + 25 others); Wed, 14 Jun 2017 08:44:00 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:36146 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640AbdFNMmR (ORCPT ); Wed, 14 Jun 2017 08:42:17 -0400 Received: by mail-wr0-f170.google.com with SMTP id 36so66313635wry.3 for ; Wed, 14 Jun 2017 05:42:16 -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=EJ8GlsbjVu7+nDbuHzkjX5EFqhoY36qesDNMm4cs4J28eF4OUfmz3ddLbM2kOr2DYw oqGJxMcYJCadsVad9U7fjyoHUBLSzlC8kEKPst7z9lY/stKam4mCdi6eKyIkQAyXW+kd puPvdSzuwMFOxhaVto9/hyD8bfQNkeIILTKXw= 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=Bql2ozldX+1oFSp55u5406N4ugihlgNNbUPlxKGksbWZlxhjm97vO33N5p+igpPRc7 3EJH9k70SZoc47bgbrpdCHXedBkjvwvXebAHFokRBLleMZt5fvjS2KE+k+3kHnndCE9A wReKWMytIkjLR1f7kN5qMxbAWwnELsior60IFBWKFvHyRa3NDMe5Q5BMyjiA31aDfyKH ffYFuYsjBzeLe/77Hk6pfvBccmW7g3Q7+Q+nT+gxWejWHPgUPcGlaOfJJwn4cbC27ibV iKc8g5gphhA7OES4vHx7ytvwSGgKIuZyeCZpQN0xk9i3f2KGAwepc7w/O1JrQ2i+tF2P zung== X-Gm-Message-State: AKS2vOykU0iLbGDTfalZ7AKpU0gw44YngSlpNM5QNqnY2lVJ3D8mhm/W p3y3HlyjJmp7v6mR X-Received: by 10.223.150.81 with SMTP id c17mr418275wra.124.1497444130576; Wed, 14 Jun 2017 05:42:10 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:19a:b336:54d7:46e9]) by smtp.gmail.com with ESMTPSA id 80sm1457015wmg.17.2017.06.14.05.42.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 05:42:09 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Arnd Bergman , John Stultz , Stephen Boyd Subject: [PATCH 18/23] clocksource/drivers: Add an alias macro CLOCKSOURCE_OF_DECLARE Date: Wed, 14 Jun 2017 14:39:39 +0200 Message-Id: <1497443984-12371-18-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497443984-12371-1-git-send-email-daniel.lezcano@linaro.org> References: <20170614123800.GH2261@mai> <1497443984-12371-1-git-send-email-daniel.lezcano@linaro.org> 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