Dear Natalia,
Thank you for the patch.
Am 25.02.26 um 10:02 schrieb Natalia Wochtman:
Remove unnecessary condition checks in
ice_ptp_setup_adapter() and ice_ptp_init().
They are duplicated in ice_pf_src_tmr_owned().
Using 75 characters per line, the above would fit in two lines.
Change ice_ptp_setup_adapter() to return void.
Reviewed-by: Przemek Kitszel <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
Signed-off-by: Natalia Wochtman <[email protected]>
---
drivers/net/ethernet/intel/ice/ice_ptp.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
b/drivers/net/ethernet/intel/ice/ice_ptp.c
index d8fd01fa617b..2b26024de888 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -3065,14 +3065,9 @@ void ice_ptp_rebuild(struct ice_pf *pf, enum
ice_reset_req reset_type)
dev_err(ice_pf_to_dev(pf), "PTP reset failed %d\n", err);
}
-static int ice_ptp_setup_adapter(struct ice_pf *pf)
+static void ice_ptp_setup_adapter(struct ice_pf *pf)
{
- if (!ice_pf_src_tmr_owned(pf) || !ice_is_primary(&pf->hw))
- return -EPERM;
-
pf->adapter->ctrl_pf = pf;
-
- return 0;
}
static int ice_ptp_setup_pf(struct ice_pf *pf)
@@ -3315,10 +3310,9 @@ void ice_ptp_init(struct ice_pf *pf)
/* If this function owns the clock hardware, it must allocate and
* configure the PTP clock device to represent it.
*/
- if (ice_pf_src_tmr_owned(pf) && ice_is_primary(hw)) {
- err = ice_ptp_setup_adapter(pf);
- if (err)
- goto err_exit;
+ if (ice_pf_src_tmr_owned(pf)) {
+ ice_ptp_setup_adapter(pf);
As the checks were duplicated, this branch was never taken, and
therefore err was never set? Is that your argument?
Did the compiler notice this redundancy, and is different code generated
now?
+
err = ice_ptp_init_owner(pf);
if (err)
goto err_exit;
Kind regards,
Paul
