ptp: remove 32 bit get/set methods.

All of the PHC drivers have been converted to the new methods.  This patch
converts the three remaining callers within the core code and removes the
older methods for good.  As a result, the core PHC code is ready for the
year 2038.  However, some of the PHC drivers are not quite ready yet.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 95bcf1525a8434ce8083f947e0713f1946c17673..da7bae9915523195def56ead30b186881c025fa4 100644 (file)
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -125,7 +125,6 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
        struct ptp_clock_info *ops = ptp->info;
        struct ptp_clock_time *pct;
        struct timespec64 ts;
-       struct timespec t2;
        int enable, err = 0;
        unsigned int i, pin_index;
 
@@ -202,12 +201,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                        pct->sec = ts.tv_sec;
                        pct->nsec = ts.tv_nsec;
                        pct++;
-                       if (ptp->info->gettime64) {
-                               ptp->info->gettime64(ptp->info, &ts);
-                       } else {
-                               ptp->info->gettime(ptp->info, &t2);
-                               ts = timespec_to_timespec64(t2);
-                       }
+                       ptp->info->gettime64(ptp->info, &ts);
                        pct->sec = ts.tv_sec;
                        pct->nsec = ts.tv_nsec;
                        pct++;

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;
 }
 

diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index 7d6f8e66396fe23425cca6ed6573c298531bf1a2..b8b73066d1379087f1ecd5bd40dbf719ad2af4ad 100644 (file)
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -64,12 +64,6 @@ struct ptp_clock_request {
  * @adjtime:  Shifts the time of the hardware clock.
  *            parameter delta: Desired change in nanoseconds.
  *
- * @gettime:  Reads the current time from the hardware clock. (deprecated)
- *            parameter ts: Holds the result.
- *
- * @settime:  Set the current time on the hardware clock. (deprecated)
- *            parameter ts: Time value to set.
- *
  * @gettime64:  Reads the current time from the hardware clock.
  *              parameter ts: Holds the result.
  *
@@ -110,8 +104,6 @@ struct ptp_clock_info {
        struct ptp_pin_desc *pin_config;
        int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta);
        int (*adjtime)(struct ptp_clock_info *ptp, s64 delta);
-       int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts);
-       int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts);
        int (*gettime64)(struct ptp_clock_info *ptp, struct timespec64 *ts);
        int (*settime64)(struct ptp_clock_info *p, const struct timespec64 *ts);
        int (*enable)(struct ptp_clock_info *ptp,