Skip to content

Commit ea531dc

Browse files
Jinjie Ruankuba-moo
authored andcommitted
net: lan743x: Remove duplicate check
Since timespec64_valid() has been checked in higher layer pc_clock_settime(), the duplicate check in lan743x_ptpci_settime64() can be removed. Acked-by: Richard Cochran <[email protected]> Signed-off-by: Jinjie Ruan <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent d8794ac commit ea531dc

File tree

1 file changed

+14
-21
lines changed

1 file changed

+14
-21
lines changed

drivers/net/ethernet/microchip/lan743x_ptp.c

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -401,28 +401,21 @@ static int lan743x_ptpci_settime64(struct ptp_clock_info *ptpci,
401401
u32 nano_seconds = 0;
402402
u32 seconds = 0;
403403

404-
if (ts) {
405-
if (ts->tv_sec > 0xFFFFFFFFLL ||
406-
ts->tv_sec < 0) {
407-
netif_warn(adapter, drv, adapter->netdev,
408-
"ts->tv_sec out of range, %lld\n",
409-
ts->tv_sec);
410-
return -ERANGE;
411-
}
412-
if (ts->tv_nsec >= 1000000000L ||
413-
ts->tv_nsec < 0) {
414-
netif_warn(adapter, drv, adapter->netdev,
415-
"ts->tv_nsec out of range, %ld\n",
416-
ts->tv_nsec);
417-
return -ERANGE;
418-
}
419-
seconds = ts->tv_sec;
420-
nano_seconds = ts->tv_nsec;
421-
lan743x_ptp_clock_set(adapter, seconds, nano_seconds, 0);
422-
} else {
423-
netif_warn(adapter, drv, adapter->netdev, "ts == NULL\n");
424-
return -EINVAL;
404+
if (ts->tv_sec > 0xFFFFFFFFLL) {
405+
netif_warn(adapter, drv, adapter->netdev,
406+
"ts->tv_sec out of range, %lld\n",
407+
ts->tv_sec);
408+
return -ERANGE;
409+
}
410+
if (ts->tv_nsec < 0) {
411+
netif_warn(adapter, drv, adapter->netdev,
412+
"ts->tv_nsec out of range, %ld\n",
413+
ts->tv_nsec);
414+
return -ERANGE;
425415
}
416+
seconds = ts->tv_sec;
417+
nano_seconds = ts->tv_nsec;
418+
lan743x_ptp_clock_set(adapter, seconds, nano_seconds, 0);
426419

427420
return 0;
428421
}

0 commit comments

Comments
 (0)