mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

media: dvb-core: get rid of mmap reserved field

Browse source 
The "reserved" field was a way, used at V4L2 API, to add new
data to existing structs without breaking userspace. However,
there are now clever ways of doing that, without needing to add
an uneeded overhead. So, get rid of them.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-12-21 10:57:13 -05:00
parent a1f18fdc72
commit a114a585be
6 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/media/uapi/dvb/dmx-expbuf.rst
View file

@ -36,8 +36,6 @@ This ioctl is an extension to the memory mapping I/O method.
It can be used to export a buffer as a DMABUF file at any time after It can be used to export a buffer as a DMABUF file at any time after
buffers have been allocated with the :ref:`DMX_REQBUFS` ioctl. buffers have been allocated with the :ref:`DMX_REQBUFS` ioctl.
The ``reserved`` array must be zeroed before calling it.
To export a buffer, applications fill struct :c:type:`dmx_exportbuffer`. To export a buffer, applications fill struct :c:type:`dmx_exportbuffer`.
Applications must set the ``index`` field. Valid index numbers Applications must set the ``index`` field. Valid index numbers
range from zero to the number of buffers allocated with :ref:`DMX_REQBUFS` range from zero to the number of buffers allocated with :ref:`DMX_REQBUFS`

2
Documentation/media/uapi/dvb/dmx-qbuf.rst
View file

@ -45,8 +45,6 @@ numbers range from zero to the number of buffers allocated with
one. The contents of the struct :c:type:`dmx_buffer` returned one. The contents of the struct :c:type:`dmx_buffer` returned
by a :ref:`DMX_QUERYBUF` ioctl will do as well. by a :ref:`DMX_QUERYBUF` ioctl will do as well.
The and ``reserved`` field must be set to 0.
When ``DMX_QBUF`` is called with a pointer to this structure, it locks the When ``DMX_QBUF`` is called with a pointer to this structure, it locks the
memory pages of the buffer in physical memory, so they cannot be swapped memory pages of the buffer in physical memory, so they cannot be swapped
out to disk. Buffers remain locked until dequeued, until the out to disk. Buffers remain locked until dequeued, until the

2
Documentation/media/uapi/dvb/dmx-querybuf.rst
View file

@ -36,8 +36,6 @@ This ioctl is part of the mmap streaming I/O method. It can
be used to query the status of a buffer at any time after buffers have be used to query the status of a buffer at any time after buffers have
been allocated with the :ref:`DMX_REQBUFS` ioctl. been allocated with the :ref:`DMX_REQBUFS` ioctl.
The ``reserved`` array must be zeroed before calling it.
Applications set the ``index`` field. Valid index numbers range from zero Applications set the ``index`` field. Valid index numbers range from zero
to the number of buffers allocated with :ref:`DMX_REQBUFS` to the number of buffers allocated with :ref:`DMX_REQBUFS`
(struct :c:type:`dvb_requestbuffers` ``count``) minus one. (struct :c:type:`dvb_requestbuffers` ``count``) minus one.

2
Documentation/media/uapi/dvb/dmx-reqbufs.rst
View file

@ -42,8 +42,6 @@ allocated by applications through a device driver, and this ioctl only
configures the driver into DMABUF I/O mode without performing any direct configures the driver into DMABUF I/O mode without performing any direct
allocation. allocation.
The ``reserved`` array must be zeroed before calling it.
To allocate device buffers applications initialize all fields of the To allocate device buffers applications initialize all fields of the
struct :c:type:`dmx_requestbuffers` structure. They set the ``count`` field struct :c:type:`dmx_requestbuffers` structure. They set the ``count`` field
to the desired number of buffers, and ``size`` to the size of each to the desired number of buffers, and ``size`` to the size of each

1
drivers/media/dvb-core/dvb_vb2.c
View file

@ -143,7 +143,6 @@ static void _fill_dmx_buffer(struct vb2_buffer *vb, void *pb)
b->length = vb->planes[0].length; b->length = vb->planes[0].length;
b->bytesused = vb->planes[0].bytesused; b->bytesused = vb->planes[0].bytesused;
b->offset = vb->planes[0].m.offset; b->offset = vb->planes[0].m.offset;
memset(b->reserved, 0, sizeof(b->reserved));
dprintk(3, "[%s]\n", ctx->name); dprintk(3, "[%s]\n", ctx->name);
} }

3
include/uapi/linux/dvb/dmx.h
View file

@ -229,7 +229,6 @@ struct dmx_buffer {
__u32 bytesused; __u32 bytesused;
__u32 offset; __u32 offset;
__u32 length; __u32 length;
__u32 reserved[4];
}; };
/** /**
@ -244,7 +243,6 @@ struct dmx_buffer {
struct dmx_requestbuffers { struct dmx_requestbuffers {
__u32 count; __u32 count;
__u32 size; __u32 size;
__u32 reserved[2];
}; };
/** /**
@ -266,7 +264,6 @@ struct dmx_exportbuffer {
__u32 index; __u32 index;
__u32 flags; __u32 flags;
__s32 fd; __s32 fd;
__u32 reserved[5];
}; };
#define DMX_START _IO('o', 41) #define DMX_START _IO('o', 41)