diff mbox series

ice: Use common error handling code in two functions

Message ID f3a2dbaf-a280-40c8-bacf-b4f0c9b0b7fe@web.de
State New
Headers show
Series ice: Use common error handling code in two functions | expand

Commit Message

Markus Elfring Sept. 19, 2024, 5:15 p.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 19 Sep 2024 19:00:25 +0200

Add jump targets so that a bit of exception handling can be better reused
at the end of two function implementations.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/net/ethernet/intel/ice/ice_ptp.c | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

--
2.46.0

Comments

Keller, Jacob E Sept. 19, 2024, 5:50 p.m. UTC | #1 
> -----Original Message-----
> From: Markus Elfring <Markus.Elfring@web.de>
> Sent: Thursday, September 19, 2024 10:15 AM
> To: intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; David S. Miller
> <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Keller, Jacob E
> <jacob.e.keller@intel.com>; Jakub Kicinski <kuba@kernel.org>; Kolacinski, Karol
> <karol.kolacinski@intel.com>; Paolo Abeni <pabeni@redhat.com>; Kitszel,
> Przemyslaw <przemyslaw.kitszel@intel.com>; Richard Cochran
> <richardcochran@gmail.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>
> Cc: LKML <linux-kernel@vger.kernel.org>
> Subject: [PATCH] ice: Use common error handling code in two functions
> 
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Thu, 19 Sep 2024 19:00:25 +0200
> 
> Add jump targets so that a bit of exception handling can be better reused
> at the end of two function implementations.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---

Seems fine.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index ef2e858f49bb..c445ae80094b 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -2813,10 +2813,8 @@  static int ice_ptp_rebuild_owner(struct ice_pf *pf)

 	/* Write the increment time value to PHY and LAN */
 	err = ice_ptp_write_incval(hw, ice_base_incval(pf));
-	if (err) {
-		ice_ptp_unlock(hw);
-		return err;
-	}
+	if (err)
+		goto err_unlock;

 	/* Write the initial Time value to PHY and LAN using the cached PHC
 	 * time before the reset and time difference between stopping and
@@ -2829,10 +2827,8 @@  static int ice_ptp_rebuild_owner(struct ice_pf *pf)
 		ts = ktime_to_timespec64(ktime_get_real());
 	}
 	err = ice_ptp_write_init(pf, &ts);
-	if (err) {
-		ice_ptp_unlock(hw);
-		return err;
-	}
+	if (err)
+		goto err_unlock;

 	/* Release the global hardware lock */
 	ice_ptp_unlock(hw);
@@ -2856,6 +2852,10 @@  static int ice_ptp_rebuild_owner(struct ice_pf *pf)
 	ice_ptp_enable_all_extts(pf);

 	return 0;
+
+err_unlock:
+	ice_ptp_unlock(hw);
+	return err;
 }

 /**
@@ -3129,18 +3129,14 @@  static int ice_ptp_init_owner(struct ice_pf *pf)

 	/* Write the increment time value to PHY and LAN */
 	err = ice_ptp_write_incval(hw, ice_base_incval(pf));
-	if (err) {
-		ice_ptp_unlock(hw);
-		goto err_exit;
-	}
+	if (err)
+		goto err_unlock;

 	ts = ktime_to_timespec64(ktime_get_real());
 	/* Write the initial Time value to PHY and LAN */
 	err = ice_ptp_write_init(pf, &ts);
-	if (err) {
-		ice_ptp_unlock(hw);
-		goto err_exit;
-	}
+	if (err)
+		goto err_unlock;

 	/* Release the global hardware lock */
 	ice_ptp_unlock(hw);
@@ -3168,6 +3164,10 @@  static int ice_ptp_init_owner(struct ice_pf *pf)
 	pf->ptp.clock = NULL;
 err_exit:
 	return err;
+
+err_unlock:
+	ice_ptp_unlock(hw);
+	return err;
 }

 /**