Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

drivers/timers, sched/clock: use file_get/file_put

Browse source 
fs_getfilep()/fs_putfilep() were renamed to file_get()/file_put().

The PTP clock paths still used the old names, breaking the PTP_CLOCK build.

Signed-off-by: raiden00pl <raiden00@railab.me>
This commit is contained in:
raiden00pl 2026-06-16 17:04:19 +02:00 • committed by Matteo Golin
parent 5e2ce6190d
commit 30c5040547
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/timers/ptp_clock.c
View file

@ -28,6 +28,7 @@
#include <errno.h> #include <errno.h>
#include <nuttx/debug.h> #include <nuttx/debug.h>
#include <nuttx/fs/fs.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/mutex.h> #include <nuttx/mutex.h>
#include <nuttx/timers/ptp_clock.h> #include <nuttx/timers/ptp_clock.h>
@ -378,7 +379,7 @@ int ptp_clockid_to_filep(clockid_t clock_id, FAR struct file **filep)
ret = clock_id >> CLOCK_SHIFT; ret = clock_id >> CLOCK_SHIFT;
if (ret >= 0) if (ret >= 0)
{ {
ret = fs_getfilep(ret, filep); ret = file_get(ret, filep);
} }
if (ret < 0) if (ret < 0)
@ -389,7 +390,7 @@ int ptp_clockid_to_filep(clockid_t clock_id, FAR struct file **filep)
ops = (*filep)->f_inode->u.i_ops; ops = (*filep)->f_inode->u.i_ops;
if (ops != &g_ptp_clock_file_ops) if (ops != &g_ptp_clock_file_ops)
{ {
fs_putfilep(*filep); file_put(*filep);
return -EINVAL; return -EINVAL;
} }

2
sched/clock/clock_adjtime.c
View file

@ -261,7 +261,7 @@ int nxclock_adjtime(clockid_t clock_id, FAR struct timex *buf)
ret = file_ioctl(filep, PTP_CLOCK_ADJTIME, ret = file_ioctl(filep, PTP_CLOCK_ADJTIME,
(unsigned long)(uintptr_t)buf); (unsigned long)(uintptr_t)buf);
fs_putfilep(filep); file_put(filep);
} }
#endif #endif

2
sched/clock/clock_getres.c
View file

@ -87,7 +87,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
} }
ret = file_ioctl(filep, PTP_CLOCK_GETRES, res); ret = file_ioctl(filep, PTP_CLOCK_GETRES, res);
fs_putfilep(filep); file_put(filep);
} }
break; break;
#endif #endif

2
sched/clock/clock_gettime.c
View file

@ -145,7 +145,7 @@ int nxclock_gettime(clockid_t clock_id, FAR struct timespec *tp)
} }
ret = file_ioctl(filep, PTP_CLOCK_GETTIME, tp); ret = file_ioctl(filep, PTP_CLOCK_GETTIME, tp);
fs_putfilep(filep); file_put(filep);
} }
#endif #endif
else else

2
sched/clock/clock_settime.c
View file

@ -160,7 +160,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
if (ret >= 0) if (ret >= 0)
{ {
ret = file_ioctl(filep, PTP_CLOCK_SETTIME, tp); ret = file_ioctl(filep, PTP_CLOCK_SETTIME, tp);
fs_putfilep(filep); file_put(filep);
} }
} }
#endif #endif