|
@@ -106,7 +106,7 @@ static int e1000e_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
|
|
|
* Read the timecounter and return the correct value in ns after converting
|
|
|
* it into a struct timespec.
|
|
|
**/
|
|
|
-static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
+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);
|
|
@@ -133,14 +133,14 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
* wall timer value.
|
|
|
**/
|
|
|
static int e1000e_phc_settime(struct ptp_clock_info *ptp,
|
|
|
- const struct timespec *ts)
|
|
|
+ const struct timespec64 *ts)
|
|
|
{
|
|
|
struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,
|
|
|
ptp_clock_info);
|
|
|
unsigned long flags;
|
|
|
u64 ns;
|
|
|
|
|
|
- ns = timespec_to_ns(ts);
|
|
|
+ ns = timespec64_to_ns(ts);
|
|
|
|
|
|
/* reset the timecounter */
|
|
|
spin_lock_irqsave(&adapter->systim_lock, flags);
|
|
@@ -171,11 +171,11 @@ static void e1000e_systim_overflow_work(struct work_struct *work)
|
|
|
struct e1000_adapter *adapter = container_of(work, struct e1000_adapter,
|
|
|
systim_overflow_work.work);
|
|
|
struct e1000_hw *hw = &adapter->hw;
|
|
|
- struct timespec ts;
|
|
|
+ struct timespec64 ts;
|
|
|
|
|
|
- adapter->ptp_clock_info.gettime(&adapter->ptp_clock_info, &ts);
|
|
|
+ adapter->ptp_clock_info.gettime64(&adapter->ptp_clock_info, &ts);
|
|
|
|
|
|
- e_dbg("SYSTIM overflow check at %ld.%09lu\n", ts.tv_sec, ts.tv_nsec);
|
|
|
+ e_dbg("SYSTIM overflow check at %lld.%09lu\n", ts.tv_sec, ts.tv_nsec);
|
|
|
|
|
|
schedule_delayed_work(&adapter->systim_overflow_work,
|
|
|
E1000_SYSTIM_OVERFLOW_PERIOD);
|
|
@@ -190,8 +190,8 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = {
|
|
|
.pps = 0,
|
|
|
.adjfreq = e1000e_phc_adjfreq,
|
|
|
.adjtime = e1000e_phc_adjtime,
|
|
|
- .gettime = e1000e_phc_gettime,
|
|
|
- .settime = e1000e_phc_settime,
|
|
|
+ .gettime64 = e1000e_phc_gettime,
|
|
|
+ .settime64 = e1000e_phc_settime,
|
|
|
.enable = e1000e_phc_enable,
|
|
|
};
|
|
|
|