> -----Original Message-----
> From: Michal Schmidt <mschm...@redhat.com>
> Sent: Tuesday, March 26, 2024 4:51 AM
> To: intel-wired-...@lists.osuosl.org
> Cc: Jesse Brandeburg <jesse.brandeb...@intel.com>; Tony Nguyen
> <anthony.l.ngu...@intel.com>; Richard Cochran
> <richardcoch...@gmail.com>; net...@vger.kernel.org; Jacob Keller
> <jacob.e.kel...@intel.com>; Jiri Pirko <j...@resnulli.us>; Arkadiusz
> Kubalewski
> <arkadiusz.kubalew...@intel.com>; Karol Kolacinski
> <karol.kolacin...@intel.com>; Marcin Szycik <marcin.szy...@linux.intel.com>;
> Przemek Kitszel <przemyslaw.kits...@intel.com>; Temerkhanov, Sergey
> <sergey.temerkha...@intel.com>
> Subject: [PATCH net-next v4 3/3] 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: Przemek Kitszel <przemyslaw.kits...@intel.com>
> Signed-off-by: Michal Schmidt <mschm...@redhat.com>
> ---
> drivers/net/ethernet/intel/ice/ice_ptp.c | 25 +++---------------------
> 1 file changed, 3 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
> b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index 0875f37add78..0f17fc1181d2 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -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;
> }
>
> --
> 2.43.2
>
Reviewed-by: Sai Krishna <saikrish...@marvell.com
