From:   Qing Wang <wangqing@vivo.com>
To:     Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>, linux-kernel@vger.kernel.org
Cc:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] trace: use WARN instead of printk and WARN_ON
Date:   Tue,  7 Dec 2021 04:55:32 -0800
Message-Id: <1638881732-3157-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6LBf5btMea1QHeu7M2XbTAndk5PYYEMn6rEsHzkqW6vtcqEPdFrx1yCI05WZ?=
 =?us-ascii?Q?QMP/reREmu/o1jIWKxn0pZzmKnqCzSm5lY9MMDG9WimMsW7xcfB+TSAHWyzo?=
 =?us-ascii?Q?mASM+/cEqvkrHkkZRAkVa7IWi4tQoz3CJYujoM373jBcayvaQiVqObavOEJU?=
 =?us-ascii?Q?/7VNIEZvkodw+983go7i66bZCp4ZBxEG2o2hqXHC6Vaz/kFl9mdECsW2aFRY?=
 =?us-ascii?Q?PqFITAhLGGXc2soBqkjmh78KTdLLks0P9ilscCIDAO9zVkBOicoMkfNwe16g?=
 =?us-ascii?Q?lJVnnBXqGzkXxASBfjqjJK7jP/jHFIGIU2eTgsDCN1PdQ7EtQSTK4yuUOXYm?=
 =?us-ascii?Q?JlhCR/NRBiUeIy+2iTcpy+WBi1GJh6mAYXhgUDGGAxMJJrYIvZ7SEM24H7vz?=
 =?us-ascii?Q?TYGPboqO+q0FDJ7KuvqpgXFrlqFUBllkP7MzxD4yc2QY7q6BkP2TtfAoJaJH?=
 =?us-ascii?Q?YPBmtjV3MdW0ERlYeuaot7qVBRqzzodhXljdGP2KQYuZzBW1j9vMXnlHIf55?=
 =?us-ascii?Q?ZdSeyRRvIf2kur5Z+RsKIDctS+4mXdVLEcMpB9r6xypoXxNchUq2MEsmRPne?=
 =?us-ascii?Q?PkfYAUrPjneFaOKTtdotOTimos5zmABfUzpI66/r63eIjCO6jcNDBcjcFbWk?=
 =?us-ascii?Q?zOc4V0G696aQ/VhRORy9djCVNWLBW4qA65BYYKZJCgSUmZ5rKAoLQze1bKdN?=
 =?us-ascii?Q?BeiTcAWogbSnYQWAvIptfAipvlK65lpNoqtOdWt9o8AszPOYoYRZjbmAdTne?=
 =?us-ascii?Q?NpzD/OMlRy2LaB8UoeuYUrONnuJBmu98GLpaDPXcLStNf8bIm/rL7DKIMfCY?=
 =?us-ascii?Q?vbsmzkw26hnH3cg6dlC+G/WhuZXsZ/mPbS54+iOJ5gMfrl5mB/PR1RHr7lSd?=
 =?us-ascii?Q?6mWkzuOiECaNjrCx0sm6608FJji2hC+YLq9xMEcnr5iBGCamF8WA0Wxlo1z7?=
 =?us-ascii?Q?vb2jGI4L0fqRNpiiN8SAbAZ4107klrvlzlW56mDQtGzUQHWqW77HsWqK3crz?=
 =?us-ascii?Q?roshI4tWvLd2h75W87p2SzuiCIQUyeZtDUMcyqb6y0EfBB6GWHummdxURAGQ?=
 =?us-ascii?Q?kQi7LqBDuZ2KbCd0HJggJXtf6OhHiX4G33zZFxMyJlJly6gnVfXCUip75qm8?=
 =?us-ascii?Q?e2mFO+u4GuUK6GzzArwHbAMhWuWZO3NinQK3AvY3eUQe0pTHtu0jqeDyYg8H?=
 =?us-ascii?Q?0wa8Iwh2T/2iGZf5jHNPlocvX+wXAMelCbiCtzs/8HmGwxVCTHUfl8Si44o5?=
 =?us-ascii?Q?abgnkMuM1we/vFsf7+XWLY4HEeND0+n4zaHTUpgyqD2HiHucWi/RH4mCE6KM?=
 =?us-ascii?Q?Iewo/P9oUMGDxT6R9vKsEF2r1joUuy4DbqfbBdC+LvgsLpZB6fLL/AxQtfus?=
 =?us-ascii?Q?xuDuIA57xI8feN0NHE7zifBfeNc5tQDeEzciE+5fFZbToWHQraSTFL8Jdddh?=
 =?us-ascii?Q?ljhfeCOag1o/zv/m0YAzMT1+YIX3jsx6nDWcr2ag1jaexLd3fzanzRynAozg?=
 =?us-ascii?Q?iOVT2AW+XmspuJS0vhXQUCCHUmnj/x4jNe44isriW9GZ/7PnFxyQHTMqqx5w?=
 =?us-ascii?Q?nPNuurjYOx3arYWoTkxg6aqNJ3MjiubD6vHYE6fAD/op11Xw6sGtYlQgQ71h?=
 =?us-ascii?Q?niWfUbmZRDirjNGX6PltoMQ=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 28050960-e401-462d-0ca6-08d9b980decf
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 12:55:39.6541
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6sn4t41M0zE8U694l7w9ocvKxouufPdpDS0aRbYrl2IecfXqaaEWfP4EThVbS9c8dMwiHZZIpBMD+bAemG+Vvw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SL2PR06MB3388
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wang Qing <wangqing@vivo.com>

Simply use WARN instead of printk(KERN_WARNING, ...) and WARN_ON.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 kernel/trace/trace_output.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 3547e71..e0348ec
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -775,8 +775,7 @@ int register_trace_event(struct trace_event *event)
 		list_add_tail(&event->list, list);
 
 	} else if (event->type > __TRACE_LAST_TYPE) {
-		printk(KERN_WARNING "Need to add type to trace.h\n");
-		WARN_ON(1);
+		WARN(1, "Need to add type to trace.h\n");
 		goto out;
 	} else {
 		/* Is this event already used */
@@ -1569,11 +1568,9 @@ __init static int init_events(void)
 		event = events[i];
 
 		ret = register_trace_event(event);
-		if (!ret) {
-			printk(KERN_WARNING "event %d failed to register\n",
-			       event->type);
-			WARN_ON_ONCE(1);
-		}
+		if (!ret)
+			WARN_ONCE(1, "event %d failed to register\n",
+				  event->type);
 	}
 
 	return 0;
-- 
2.7.4