From bab08bedcdc33a644682197f3c88a6e56c325fcf Mon Sep 17 00:00:00 2001

From: Lijun Pan <lijunp213@gmail.com>

Date: Thu, 11 Feb 2021 00:43:19 -0600

Subject: [PATCH] ibmvnic: fix block comments

References: bsc#1184114 ltc#192237 bsc#1183871 ltc#192139

Patch-mainline: v5.12-rc1

Git-commit: bab08bedcdc33a644682197f3c88a6e56c325fcf

Fix the following checkpatch warning:

WARNING: networking block comments don't use an empty /* line, use /* Comment...

Signed-off-by: Lijun Pan <lijunp213@gmail.com>

Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++--------

 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c

index 55970f02d9da..5c6f6a7b2e3f 100644

--- a/drivers/net/ethernet/ibm/ibmvnic.c

+++ b/drivers/net/ethernet/ibm/ibmvnic.c

@@ -1221,8 +1221,7 @@ static int ibmvnic_open(struct net_device *netdev)

 	rc = __ibmvnic_open(netdev);

 out:

-	/*

-	 * If open fails due to a pending failover, set device state and

+	/* If open fails due to a pending failover, set device state and

 	 * return. Device operation will be handled by reset routine.

 	 */

 	if (rc && adapter->failover_pending) {

@@ -1946,8 +1945,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,

 	if (!(adapter->reset_reason == VNIC_RESET_CHANGE_PARAM))

 		rtnl_lock();

-	/*

-	 * Now that we have the rtnl lock, clear any pending failover.

+	/* Now that we have the rtnl lock, clear any pending failover.

 	 * This will ensure ibmvnic_open() has either completed or will

 	 * block until failover is complete.

 	 */

@@ -2249,8 +2247,7 @@ static void __ibmvnic_reset(struct work_struct *work)

 		spin_unlock_irqrestore(&adapter->state_lock, flags);

 		if (adapter->force_reset_recovery) {

-			/*

-			 * Since we are doing a hard reset now, clear the

+			/* Since we are doing a hard reset now, clear the

 			 * failover_pending flag so we don't ignore any

 			 * future MOBILITY or other resets.

 			 */

@@ -2322,8 +2319,7 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,

 	unsigned long flags;

 	int ret;

-	/*

-	 * If failover is pending don't schedule any other reset.

+	/* If failover is pending don't schedule any other reset.

 	 * Instead let the failover complete. If there is already a

 	 * a failover reset scheduled, we will detect and drop the

 	 * duplicate reset when walking the ->rwi_list below.

-- 

2.26.2