| Message ID | 051364a3a57d36200f652f4d8e1c9bfc4edf3254.1427835485.git.richardcochran@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2015-03-31 at 23:08 +0200, Richard Cochran wrote: > This patch changes the driver to use ns_to_timespec64() instead of > open coding the same logic. > > Compile tested only. > > Signed-off-by: Richard Cochran <richardcochran@gmail.com> > --- > drivers/net/ethernet/intel/e1000e/ptp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c > index b747a3e..d2272ad 100644 > --- a/drivers/net/ethernet/intel/e1000e/ptp.c > +++ b/drivers/net/ethernet/intel/e1000e/ptp.c > @@ -111,15 +111,13 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) > struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, > ptp_clock_info); > unsigned long flags; > - u32 remainder; > u64 ns; > > spin_lock_irqsave(&adapter->systim_lock, flags); > ns = timecounter_read(&adapter->tc); > spin_unlock_irqrestore(&adapter->systim_lock, flags); > > - ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder); > - ts->tv_nsec = remainder; > + *ts = ns_to_timespec64(ns); > > return 0; > } Acked-by: Jacob Keller <jacob.e.keller@intel.com>
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index b747a3e..d2272ad 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c @@ -111,15 +111,13 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, ptp_clock_info); unsigned long flags; - u32 remainder; u64 ns; spin_lock_irqsave(&adapter->systim_lock, flags); ns = timecounter_read(&adapter->tc); spin_unlock_irqrestore(&adapter->systim_lock, flags); - ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder); - ts->tv_nsec = remainder; + *ts = ns_to_timespec64(ns); return 0; }
This patch changes the driver to use ns_to_timespec64() instead of open coding the same logic. Compile tested only. Signed-off-by: Richard Cochran <richardcochran@gmail.com> --- drivers/net/ethernet/intel/e1000e/ptp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)