Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1191958pxb; Wed, 10 Feb 2021 02:21:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJz52JXP7fUHiBq3v/EAhwnlK8dYlRFD/QfuybijmKfXHpc931VJYVw/Mc6LRr17KENBc2yc X-Received: by 2002:a17:907:98a8:: with SMTP id ju8mr1554094ejc.35.1612952492257; Wed, 10 Feb 2021 02:21:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612952492; cv=none; d=google.com; s=arc-20160816; b=fJvUQh9ORQnE5bBHAgyNGih1XpZKpzFPso8Qg9u29LUN3UaeUrPNNf89rrxRTo7AEE vCDtyVfgpeE9AbisI6zfu27U2ITCEd/KeB1xx3CoDM/VCK2C96oc0Q7IAv2cvE/rQy4s ul5VDE1nPNz/8arycM3A7xo7NKGBOHqc7M/ha215Lv6CUTulDSqhTZGUCRLp9AM27Quw FwXwcrdgzQU2sIMkmEalZ8ySrrUCicWWIXp+u/LIN/S/QtYna9/LKjehSdqlpcMBj/bm CAYzkhf7w7qiVL4ghuhXjuvjoP76paMkwRdElBFgs4mOFXFeEP7lmuQu2DDpVrZCbrEl Op3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=nJcrmQ57CHjcbwf0NnLOyiHFUbKWI4/RpoCBaREn3jo=; b=V05L0u5w+dtuUOiBELO+UB9jYiGBmhV4hJUOG0IO48IwmPvVFVBQ8I6otMUaV6g0EJ ZrRKxQHVE+7VZlj5UkEhOUgnkbR+u2v06ytx2aXE+QkXk9h+PBTHA20/hnGXpITB96S/ PREMUvyp4x1BvjcT/OPS+dducTJ9DFkwidbsRePsR1qdy0Pzkt+kTFyPRq09a9y430wr HoJtMj/1/UZB880B7mwGuoyDsQHjUtKxvdUen5z1+B1rbIJNFB3lsmQIXrWSqZwWU62b lu4b17VU3iAAADzeEmuo9ajXJMcfm1082+9bp6da/FxsN+zhnS//F3h3YB9/4ArToAm8 R/Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nO13LaRz; dkim=neutral (no key) header.i=@linutronix.de header.b=pQhycNE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gz13si975563ejb.726.2021.02.10.02.21.06; Wed, 10 Feb 2021 02:21:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nO13LaRz; dkim=neutral (no key) header.i=@linutronix.de header.b=pQhycNE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbhBJKUY (ORCPT + 99 others); Wed, 10 Feb 2021 05:20:24 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:58084 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230362AbhBJKHK (ORCPT ); Wed, 10 Feb 2021 05:07:10 -0500 Date: Wed, 10 Feb 2021 10:06:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1612951587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nJcrmQ57CHjcbwf0NnLOyiHFUbKWI4/RpoCBaREn3jo=; b=nO13LaRzePzGFiwKzBy03s9gVc6NdLg862ns9Jx/Rz6jQy6xYfAOstcF0gjVQQCKqhILZz 7JzuJxnkGpChbWmTSbiIeni6gIkNy3w4pm7LrkKj+t/MfFvQBU83Rb0G5DD4+9JGurBR+8 QrH3bMKxIRYGHPi2KXvLH48snRYkmejazq8TUVY7dyQXpTOzx2T0yx7UsPNJ/m5gTa639i 0k6rRwZb9uZJC6P83kvjqlvcAF0x9IemVSqS37+zVWMnyyvF4KCxcvO+fbOI1dc7oZ+lCm UqxGdXwqMWdBfcuk8TNO8PWrjYZLCBN1QZnj2CPXYPgSOB3ggn8DHdMRpaNX6g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1612951587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nJcrmQ57CHjcbwf0NnLOyiHFUbKWI4/RpoCBaREn3jo=; b=pQhycNE1G48FrA8/p/DFuEEoz1iD6604X4OFoSwSF/uj1ZM+qOiiwHMGxtbg4LLkY/rjwz mJFGJEUOaFRwF+BA== From: "tip-bot2 for Bartosz Golaszewski" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/davinci: Move pr_fmt() before the includes Cc: Bartosz Golaszewski , David Lechner , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210111140814.3668-1-brgl@bgdev.pl> References: <20210111140814.3668-1-brgl@bgdev.pl> MIME-Version: 1.0 Message-ID: <161295158523.23325.8387673102530314590.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 98509310e490bf3de13c96fbbbca8ef4af9db010 Gitweb: https://git.kernel.org/tip/98509310e490bf3de13c96fbbbca8ef4af9db010 Author: Bartosz Golaszewski AuthorDate: Mon, 11 Jan 2021 15:08:14 +01:00 Committer: Daniel Lezcano CommitterDate: Mon, 18 Jan 2021 16:31:39 +01:00 clocksource/drivers/davinci: Move pr_fmt() before the includes We no longer need to undef pr_fmt if we define our own before including any headers. Signed-off-by: Bartosz Golaszewski Acked-by: David Lechner Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20210111140814.3668-1-brgl@bgdev.pl --- drivers/clocksource/timer-davinci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index bb4eee3..9996c05 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -7,6 +7,8 @@ * (with tiny parts adopted from code by Kevin Hilman ) */ +#define pr_fmt(fmt) "%s: " fmt, __func__ + #include #include #include @@ -17,9 +19,6 @@ #include -#undef pr_fmt -#define pr_fmt(fmt) "%s: " fmt, __func__ - #define DAVINCI_TIMER_REG_TIM12 0x10 #define DAVINCI_TIMER_REG_TIM34 0x14 #define DAVINCI_TIMER_REG_PRD12 0x18