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;
From:   Wan Jiabing <wanjiabing@vivo.com>
To:     Corey Minyard <minyard@acm.org>,
        openipmi-developer@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Cc:     kael_w@yeah.net, Wan Jiabing <wanjiabing@vivo.com>
Subject: [PATCH] ipmi: simplify duplicated if condition
Date:   Sun, 24 Oct 2021 21:22:06 -0400
Message-Id: <20211025012206.21189-1-wanjiabing@vivo.com>
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?kaNoTLZaQ2VY5Vy2P2WFaPH6JsvO1RuWFLBSMaNCCWjJ0o4HyIlYpvTTNWVx?=
 =?us-ascii?Q?Dn/ZSuG4n3EyiwTDIq27wjuqD4vyeEXzVd5c77ZT4lJhMiZYOUSzblgxyYSA?=
 =?us-ascii?Q?estYR23EnRzY6LYjqE4f7OkHR9F0HNsHFMrc/86NxgXa44i4a1nM+sdw+i+Z?=
 =?us-ascii?Q?KbRm2+HUxbZol1A7dmfDu/xeZkM8TJO7q1abWsjcDHU+Y1SvMQX4oYqwNAEo?=
 =?us-ascii?Q?lDX39Tip5QAHbhq8w6Xnq3Gqqg/TP0sjuflanNVR3HU7CCpHZ0KRlaKY1XXt?=
 =?us-ascii?Q?KvlqxZ9ZWv1vpxSQ4XevPbsi/e+j+XbvGO622HcIFN5MrXIv5F0E3fiNpkvn?=
 =?us-ascii?Q?UuKwLaHY1GycLuOr5SPj6lppaYxgEHxN605FU5v2TYkhCKIxwZRMn6MZgGWM?=
 =?us-ascii?Q?UOpTiTgj9Fdbeppd3kuktYbbZBdmzkYdXxY0u8XNn6eEGYIwhkms9E0gcXe9?=
 =?us-ascii?Q?nOYr21rfrED8KjZ8zbwk/AbCFgJpYF2g4KGK7JOUOORaY1wqgLwKRpDOpecF?=
 =?us-ascii?Q?sFp4NocC/mWfYeOEnUQnM1lVaGfcCnqyJXdB/l6yJZ3r7VoK4sWQCx8MqTLk?=
 =?us-ascii?Q?A9soCVWejTRu7FB9tjEyon7ov3V50YyOrrpmLkD/HsuuYM3PQXkdtrLAOQQg?=
 =?us-ascii?Q?5jMwbyRFBYVF0zi779KbaxMn36N41eK82WhfBiEw2VIFQsknJK01M3kLzf/a?=
 =?us-ascii?Q?ZmsVhGicD+rnlNJLyL84GwmN74F9LDT2sg2FM24oY1EBBEpXo5FUB8BTOFfh?=
 =?us-ascii?Q?wVaYOhLZkYN244k5Os4qqOhlsRV3kQH9hOqIFUvU8iiSdXLA2pRCF54DAVpw?=
 =?us-ascii?Q?4osZbTboFWGLx9MFoZLe8boRH9nBTx8OckDTC+OdPL0ggUHKlgtnh++IRC7M?=
 =?us-ascii?Q?V6KgyZM1v2WmhOb/r1WXFYX2PL8+o/8ObiuG+SiwngWn+z5ZkojbgVCTzDII?=
 =?us-ascii?Q?wEh0WvakprUYG1y1jd0DekP60t7dQRaxF2SJxPixELpCaXQNk1kZ7b66NN2F?=
 =?us-ascii?Q?prk0tS462SBaC+MgrEdegTkM7EK4RjKOGsurtJ2tphtvnDNn7Zs8Wndx+YjT?=
 =?us-ascii?Q?d/qH1qMDA9EQjFZvmIxhk/VGS7RBHUuBOOMRjKZd3M2VIw2QQgSa6ChR7fQ2?=
 =?us-ascii?Q?RyRZIb8TzkTTAozfdkw283qqwxtNQi8jG2cQWQhjo5p6IfE7zpS/HnkcyWzJ?=
 =?us-ascii?Q?wYZ9KhMtGsmLscDVQbbShcjyHt4OzIkSygg9TLLRyjPqS6oHFA8KrT1M4BLj?=
 =?us-ascii?Q?HsnxEjm6KkP0KMc4BPyKojyk8iIA49DhC8JI8DdWRM4QMeZNSGu+mywNDUdS?=
 =?us-ascii?Q?7yJeRdQxwD/2kGeLhORE2HS4ndQCOeKdhX9NrLUtQuC7AbzI11GM1RP4gPsd?=
 =?us-ascii?Q?KpyjBiHsazuuquIMhsLm8Kwu6yrf5TauySvIC6teHp14dECedZ+Aq/b9DSn9?=
 =?us-ascii?Q?IDUypYge/EHQbnQCyMhg9vheKj1hEJe5h03skLS8n34TaHeVUNZ3mzit+lnK?=
 =?us-ascii?Q?ozbSkb+J/7p/H/MJIr43lp6cwu8Lb/4C6+AUP+G92pBaykmSG9DnYgy9P9Zd?=
 =?us-ascii?Q?CHBsBPv0rstQYqIVxqN9t7ry6rqBRExXXgBMjtlgN/UeI6MbFjZ4Oue5hyP5?=
 =?us-ascii?Q?ZKcWRzoXnjLqUl6GZcGZUYU=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 02aaa601-ec2b-44b8-3e57-08d99756123e
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3367.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2021 01:23:38.2004
 (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: 4vPPzMqw6KdX3bJbLKOYk6+6HjIwOm3XBBaScSDIB2u9iDROOGQ432LNcio2YkLisF5Nkg4Mw+Y5ZWYK0QHriw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB3725
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There are 5 duplicated 'if' conditions to judge the 'run_to_completion',
which looks redundant. And there is no function to modify this variable.

Reduce the 'if' conditions from 5 times to 1 time can make code easy to
understand and fix following coccicheck warning:

./drivers/char/ipmi/ipmi_msghandler.c :4771:2-19: ERROR: nested
lock+irqsave that reuses flags from line 4764.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 drivers/char/ipmi/ipmi_msghandler.c | 38 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index a60201d3f735..072da25124cf 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -4756,32 +4756,30 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf,
 	unsigned long flags = 0; /* keep us warning-free. */
 	int run_to_completion = intf->run_to_completion;
 
-	/*
-	 * To preserve message order, we keep a queue and deliver from
-	 * a tasklet.
-	 */
-	if (!run_to_completion)
+	if (!run_to_completion) {
+		/*
+		 * To preserve message order, we keep a queue and deliver from
+		 * a tasklet.
+		 */
 		spin_lock_irqsave(&intf->waiting_rcv_msgs_lock, flags);
-	list_add_tail(&msg->link, &intf->waiting_rcv_msgs);
-	if (!run_to_completion)
+		list_add_tail(&msg->link, &intf->waiting_rcv_msgs);
 		spin_unlock_irqrestore(&intf->waiting_rcv_msgs_lock,
 				       flags);
-
-	if (!run_to_completion)
 		spin_lock_irqsave(&intf->xmit_msgs_lock, flags);
-	/*
-	 * We can get an asynchronous event or receive message in addition
-	 * to commands we send.
-	 */
-	if (msg == intf->curr_msg)
-		intf->curr_msg = NULL;
-	if (!run_to_completion)
+		/*
+		 * We can get an asynchronous event or receive message in addition
+		 * to commands we send.
+		 */
+		if (msg == intf->curr_msg)
+			intf->curr_msg = NULL;
 		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
-
-	if (run_to_completion)
-		smi_recv_tasklet(&intf->recv_tasklet);
-	else
 		tasklet_schedule(&intf->recv_tasklet);
+	} else {
+		list_add_tail(&msg->link, &intf->waiting_rcv_msgs);
+		if (msg == intf->curr_msg)
+			intf->curr_msg = NULL;
+		smi_recv_tasklet(&intf->recv_tasklet);
+	}
 }
 EXPORT_SYMBOL(ipmi_smi_msg_received);
 
-- 
2.20.1