Merge branch 'iocb' into for-davem

[deliverable/linux.git] / drivers / ptp / ptp_clock.c

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index df50d5eeae6f6c570be02783b7a81b2c1337b1f5..2e481b9e8ea597858e08ab8933374fce8ccd197c 100644 (file)
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -109,9 +109,7 @@ static int ptp_clock_settime(struct posix_clock *pc, const struct timespec *tp)
        struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
        struct timespec64 ts = timespec_to_timespec64(*tp);
 
-       return  ptp->info->settime64 ?
-               ptp->info->settime64(ptp->info, &ts) :
-               ptp->info->settime(ptp->info, tp);
+       return  ptp->info->settime64(ptp->info, &ts);
 }
 
 static int ptp_clock_gettime(struct posix_clock *pc, struct timespec *tp)
@@ -120,14 +118,9 @@ static int ptp_clock_gettime(struct posix_clock *pc, struct timespec *tp)
        struct timespec64 ts;
        int err;
 
-       if (ptp->info->gettime64) {
-               err = ptp->info->gettime64(ptp->info, &ts);
-               if (!err)
-                       *tp = timespec64_to_timespec(ts);
-       } else {
-               err = ptp->info->gettime(ptp->info, tp);
-       }
-
+       err = ptp->info->gettime64(ptp->info, &ts);
+       if (!err)
+               *tp = timespec64_to_timespec(ts);
        return err;
 }