Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>,
        linux-kernel@vger.kernel.org (open list)
Cc:     zhengkui_guo@outlook.com, Guo Zhengkui <guozhengkui@vivo.com>,
        Qing Wang <wangqing@vivo.com>
Subject: [PATCH v2] trace: use WARN instead of printk and WARN_ON
Date:   Sun, 24 Apr 2022 20:09:54 +0800
Message-Id: <20220424120954.3368-1-guozhengkui@vivo.com>
In-Reply-To: <20211207091843.0765fa3f@gandalf.local.home>
References: <20211207091843.0765fa3f@gandalf.local.home>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ihQdhDF0KN39gsGGqSducGY+S7ybLV64+ASEMT/ktPmjkk4xxbfCOWrVOoxm?=
 =?us-ascii?Q?V1vbUO0v2aSAsMZVwfRo/C40g7dThphbmaYSorUz5IqkNVbENSdGhZG0BZvu?=
 =?us-ascii?Q?p+a+8ZsEQyyEcG6pZ/0RyWeW7cMKpz+jlDb00b0nYTxjEjnr4deyxLz/cQtU?=
 =?us-ascii?Q?PMBqbeh8i2vsgAuAadAYaBzC2UJzLPS9hZ2zCI7RssfT/YsdXz4N4wXUP+8k?=
 =?us-ascii?Q?8AW5KwgqQn/DOkN3E7/U1Qe4n1vb2fjlAS57j9+Jf3WX5mdVFrwHff6NC2O9?=
 =?us-ascii?Q?c7Lj9unfoNO6gGzlJNqMccu2OLNAQNK5GVAKvnkM7mGHQtBwvlQwKw7pIR/z?=
 =?us-ascii?Q?N6ATsoIArsdOVP/2//255tZSKgWTQDq9XOWFLMmliz4hN+mIM7GRoeQF9TOj?=
 =?us-ascii?Q?0fVcjzoKR5//disiXd2SwRBC9fexZYOZu1TWPV1a3LWivDQAXMUzE2uqmAuD?=
 =?us-ascii?Q?0PO2Bt0DhnsdBcnPP89dA0MEeS04ZpxIt6YmkGgbF7qWQLuAIbO8/yLgCkM/?=
 =?us-ascii?Q?3h5XSOXsE191B1wgyUASnEhUranXSCtLsRRBLoqhQmqigEN6BIykZcx9xxsI?=
 =?us-ascii?Q?9LOwzvcSXJGAosoMCOrEYyDVxB7wsAXdg7d+ypPa4vJk5359AYgFowxapfT7?=
 =?us-ascii?Q?YDbungM5NkpIeUb5vGcOPBYiH7pkF8ZfH++Rak/tuWLqSUkQosP1UJBU5jNM?=
 =?us-ascii?Q?OB0VC1gaa1GPb0ZETAe3ixBKk/rdRwhQlcpSxaV0On5SdEcBiQLEIsRXoe/0?=
 =?us-ascii?Q?CXb6Tw8/todbhw3ue6ktNKgZ0SPgA+6CJm/Bizo7jhW/dXuYANS3Jkshd3Ax?=
 =?us-ascii?Q?4YFWgaA2iLGqJvCA+iNFJqCXEtTz98QFZrztukXg4un5Nju2+0KOqzpQ/0Li?=
 =?us-ascii?Q?LOqAL3lDb893knkuD+6Sj+STI9/U7CA9lU70kPeV4EzCHa4WUqHBrBquN4pY?=
 =?us-ascii?Q?b0HljIdu+fzQjV8WV4rZWVa4L/bH2aVRGuJZMgL4KZ6uY7ykWtba1RKn4MZe?=
 =?us-ascii?Q?+zcdH4a8vJWVWZeT9DfjuzntftF8zV1mlMCkqDaWbTP4Ezdl43zWJP3XGko9?=
 =?us-ascii?Q?sPyZt8AXv62AtJ++OobXkzfoFHg1iczqGigBvPZQhr9hIlqycwiS3qRAIoLk?=
 =?us-ascii?Q?2rJl6aztkeAQX66tsi9lXL+Xr3acD5gKefc0LbCB6h4VxVfVIYtEtL4peiE+?=
 =?us-ascii?Q?S0mF0DNNcpMesIBpdnfS+b+qnknngsiw3DErXcyKKv9DMoAwaEo6+i5lAZwy?=
 =?us-ascii?Q?ZkWDRg/CxKig17lG870f3DJgL/QDLqeal0zC+EFxxVPfqW1JYTFdOiF3XMCh?=
 =?us-ascii?Q?WnG+uHFFqhebFonAMn3KMz1311IvG1FB+F0nvjUd3YtdhOrtvkZW44OhZ3G3?=
 =?us-ascii?Q?jiP8+0iACNdnZLE3R1x6HmS/hHuMZaUVuJyMtybKa7O7J4LvpmfVgGTZmUkJ?=
 =?us-ascii?Q?1T5u60CKjrygZOZXhpYRlARPgT9ntB0cEXZJMaeaOCmRrvoFzIZ4yIKhWdTx?=
 =?us-ascii?Q?+rBCOuDcGjHns5IUyOnVsEhSCTV3OOtDTotPm1j1KhJ9vOXWEr+ouzAommKd?=
 =?us-ascii?Q?Daf9gjvoxWb0SW/UJz6f24FpSxBxk0YEYOdKpds/cGWFeavjfpHaZ1FGsxYZ?=
 =?us-ascii?Q?OfSy90UHNKBJ1n2khDDTaGn1Us0cn9rsp1zfwks1MtUoqehZe/svX4izcqrt?=
 =?us-ascii?Q?ZRIWk1tKQzBzeLpRZUKijYN/qaKx6xpdL/N6Fdx5sMjGi332NNgab3CkaEZh?=
 =?us-ascii?Q?zzUn7y9icg=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6a31ac0f-bf08-4a0e-b8d2-08da25eb63bb
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 12:10:14.8698
 (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: qaBdp07jebg4eMdCbkuEf8r4JS8NAbAlEct8GljaJSH/jV95XrcVBfhLTQQA250BATW3wQhm5hhTftgOH4Po2Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB2712
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use `WARN(cond, ...)` instead of `if (cond)` + `printk(...)` +
`WARN_ON(1)`.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Qing Wang <wangqing@vivo.com>
Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
v1 -> v2: Put WARN in the condition according to Steven's suggestion.

 kernel/trace/trace_output.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 8aa493d25c73..d89e3f7e26eb 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -778,9 +778,8 @@ 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);
+	} else if (WARN(event->type > __TRACE_LAST_TYPE,
+			"Need to add type to trace.h")) {
 		goto out;
 	} else {
 		/* Is this event already used */
@@ -1571,13 +1570,8 @@ __init static int init_events(void)
 
 	for (i = 0; events[i]; i++) {
 		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);
-		}
+		WARN_ONCE(!ret, "event %d failed to register", event->type);
 	}
 
 	return 0;
-- 
2.20.1