| Message ID | 20191216141506.121728-2-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 71e37d2e4b3b9b5ab143ee52f9ebb43e01068594 |
| Headers | show |
| Series | y2038 safety in v4l2 | expand |
Em Mon, 16 Dec 2019 15:14:59 +0100 Arnd Bergmann <arnd@arndb.de> escreveu: > The type for the timestamp in video_event was changed to > 'long' a long time ago, change the documentation to match. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> This patch seems fine for me. Even if the other patches need a v7, let's apply this one and remove it from any future re-spin of this (if ever needed). > --- > Documentation/media/uapi/dvb/video-get-event.rst | 2 +- > Documentation/media/uapi/dvb/video_types.rst | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/media/uapi/dvb/video-get-event.rst b/Documentation/media/uapi/dvb/video-get-event.rst > index def6c40db601..7f03fbe3d3b0 100644 > --- a/Documentation/media/uapi/dvb/video-get-event.rst > +++ b/Documentation/media/uapi/dvb/video-get-event.rst > @@ -81,7 +81,7 @@ for this ioctl call. > #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 > #define VIDEO_EVENT_DECODER_STOPPED 3 > #define VIDEO_EVENT_VSYNC 4 > - __kernel_time_t timestamp; > + long timestamp; > union { > video_size_t size; > unsigned int frame_rate; /* in frames per 1000sec */ > diff --git a/Documentation/media/uapi/dvb/video_types.rst b/Documentation/media/uapi/dvb/video_types.rst > index 479942ce6fb8..2697400ccf62 100644 > --- a/Documentation/media/uapi/dvb/video_types.rst > +++ b/Documentation/media/uapi/dvb/video_types.rst > @@ -170,7 +170,7 @@ VIDEO_GET_EVENT call. > #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 > #define VIDEO_EVENT_DECODER_STOPPED 3 > #define VIDEO_EVENT_VSYNC 4 > - __kernel_time_t timestamp; > + long timestamp; > union { > video_size_t size; > unsigned int frame_rate; /* in frames per 1000sec */ Cheers, Mauro
diff --git a/Documentation/media/uapi/dvb/video-get-event.rst b/Documentation/media/uapi/dvb/video-get-event.rst index def6c40db601..7f03fbe3d3b0 100644 --- a/Documentation/media/uapi/dvb/video-get-event.rst +++ b/Documentation/media/uapi/dvb/video-get-event.rst @@ -81,7 +81,7 @@ for this ioctl call. #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 #define VIDEO_EVENT_DECODER_STOPPED 3 #define VIDEO_EVENT_VSYNC 4 - __kernel_time_t timestamp; + long timestamp; union { video_size_t size; unsigned int frame_rate; /* in frames per 1000sec */ diff --git a/Documentation/media/uapi/dvb/video_types.rst b/Documentation/media/uapi/dvb/video_types.rst index 479942ce6fb8..2697400ccf62 100644 --- a/Documentation/media/uapi/dvb/video_types.rst +++ b/Documentation/media/uapi/dvb/video_types.rst @@ -170,7 +170,7 @@ VIDEO_GET_EVENT call. #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 #define VIDEO_EVENT_DECODER_STOPPED 3 #define VIDEO_EVENT_VSYNC 4 - __kernel_time_t timestamp; + long timestamp; union { video_size_t size; unsigned int frame_rate; /* in frames per 1000sec */
The type for the timestamp in video_event was changed to 'long' a long time ago, change the documentation to match. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- Documentation/media/uapi/dvb/video-get-event.rst | 2 +- Documentation/media/uapi/dvb/video_types.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.0