A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

ptp: remove 32 bit get/set methods.

Browse source 
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Richard Cochran 2015-03-29 23:12:13 +02:00 • committed by David S. Miller
commit ed7c6317bc
3 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/ptp/ptp_chardev.c
View file

@ -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++;

15
drivers/ptp/ptp_clock.c
View file

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