]> www.infradead.org Git - nvme.git/commitdiff
net: lan743x: Remove duplicate check
authorJinjie Ruan <ruanjinjie@huawei.com>
Wed, 9 Oct 2024 07:23:02 +0000 (15:23 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 15 Oct 2024 00:22:43 +0000 (17:22 -0700)
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 <richardcochran@gmail.com>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20241009072302.1754567-3-ruanjinjie@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/microchip/lan743x_ptp.c

index dcea6652d56d2b43fcc65a58e47087a59a507542..4a777b449ecd03ac0d7576f8570f1a7794fb3d06 100644 (file)
@@ -401,28 +401,21 @@ static int lan743x_ptpci_settime64(struct ptp_clock_info *ptpci,
        u32 nano_seconds = 0;
        u32 seconds = 0;
 
-       if (ts) {
-               if (ts->tv_sec > 0xFFFFFFFFLL ||
-                   ts->tv_sec < 0) {
-                       netif_warn(adapter, drv, adapter->netdev,
-                                  "ts->tv_sec out of range, %lld\n",
-                                  ts->tv_sec);
-                       return -ERANGE;
-               }
-               if (ts->tv_nsec >= 1000000000L ||
-                   ts->tv_nsec < 0) {
-                       netif_warn(adapter, drv, adapter->netdev,
-                                  "ts->tv_nsec out of range, %ld\n",
-                                  ts->tv_nsec);
-                       return -ERANGE;
-               }
-               seconds = ts->tv_sec;
-               nano_seconds = ts->tv_nsec;
-               lan743x_ptp_clock_set(adapter, seconds, nano_seconds, 0);
-       } else {
-               netif_warn(adapter, drv, adapter->netdev, "ts == NULL\n");
-               return -EINVAL;
+       if (ts->tv_sec > 0xFFFFFFFFLL) {
+               netif_warn(adapter, drv, adapter->netdev,
+                          "ts->tv_sec out of range, %lld\n",
+                          ts->tv_sec);
+               return -ERANGE;
+       }
+       if (ts->tv_nsec < 0) {
+               netif_warn(adapter, drv, adapter->netdev,
+                          "ts->tv_nsec out of range, %ld\n",
+                          ts->tv_nsec);
+               return -ERANGE;
        }
+       seconds = ts->tv_sec;
+       nano_seconds = ts->tv_nsec;
+       lan743x_ptp_clock_set(adapter, seconds, nano_seconds, 0);
 
        return 0;
 }