github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ice: remove redundant checks from PTP init

Browse Source 
Remove unnecessary condition checks in ice_ptp_setup_adapter() and
ice_ptp_init(). They are duplicated in ice_pf_src_tmr_owned().

Change ice_ptp_setup_adapter() to return void.

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Natalia Wochtman <natalia.wochtman@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20260609213559.178657-3-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Natalia Wochtman 2026-06-09 14:35:43 -07:00 committed by Jakub Kicinski
parent 711bdf0b78
commit e5652e6d37
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/intel/ice/ice_ptp.c
View File

@ -3058,14 +3058,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)
@ -3323,10 +3318,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);
err = ice_ptp_init_owner(pf);
if (err)
goto err_exit;