Commit 22118810 authored by Michal Schmidt's avatar Michal Schmidt Committed by Tony Nguyen
Browse files

ice: fold ice_ptp_read_time into ice_ptp_gettimex64 



This is a cleanup. It is unnecessary to have this function just to call
another function.

Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Reviewed-by: default avatarSai Krishna <saikrishnag@marvell.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d29a8134

drivers/net/ethernet/intel/ice/ice_ptp.c

+3 −22
Original line number Diff line number Diff line
@@ -1166,26 +1166,6 @@ static void ice_ptp_reset_cached_phctime(struct ice_pf *pf) 
	ice_ptp_mark_tx_tracker_stale(&pf->ptp.port.tx);

}



/**

 * ice_ptp_read_time - Read the time from the device

 * @pf: Board private structure

 * @ts: timespec structure to hold the current time value

 * @sts: Optional parameter for holding a pair of system timestamps from

 *       the system clock. Will be ignored if NULL is given.

 *

 * This function reads the source clock registers and stores them in a timespec.

 * However, since the registers are 64 bits of nanoseconds, we must convert the

 * result to a timespec before we can return.

 */

static void

ice_ptp_read_time(struct ice_pf *pf, struct timespec64 *ts,

		  struct ptp_system_timestamp *sts)

{

	u64 time_ns = ice_ptp_read_src_clk_reg(pf, sts);



	*ts = ns_to_timespec64(time_ns);

}



/**

 * ice_ptp_write_init - Set PHC time to provided value

 * @pf: Board private structure
@@ -1926,9 +1906,10 @@ ice_ptp_gettimex64(struct ptp_clock_info *info, struct timespec64 *ts, 
		   struct ptp_system_timestamp *sts)

{

	struct ice_pf *pf = ptp_info_to_pf(info);

	u64 time_ns;



	ice_ptp_read_time(pf, ts, sts);



	time_ns = ice_ptp_read_src_clk_reg(pf, sts);

	*ts = ns_to_timespec64(time_ns);

	return 0;

}