diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-03-10 09:43:24 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-13 10:00:35 -0400 |
| commit | 87185c958de9cd4acd8392f00d6161f4e11807ff (patch) | |
| tree | 94f4f59c6f0efeef8f47f9408c8dc3c3101c0e43 | |
| parent | c350912c8b98922cbf6d4c25989b6a16df54f4c1 (diff) | |
[media] v4l: rename v4l2_format_sdr to v4l2_sdr_format
Rename v4l2_format_sdr to v4l2_sdr_format in order to keep it in
line with other formats.
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-sdr.xml | 2 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 2 | ||||
| -rw-r--r-- | include/uapi/linux/videodev2.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/DocBook/media/v4l/dev-sdr.xml b/Documentation/DocBook/media/v4l/dev-sdr.xml index ac9f1af35267..524b9c402421 100644 --- a/Documentation/DocBook/media/v4l/dev-sdr.xml +++ b/Documentation/DocBook/media/v4l/dev-sdr.xml | |||
| @@ -78,7 +78,7 @@ of the data format. | |||
| 78 | </para> | 78 | </para> |
| 79 | 79 | ||
| 80 | <table pgwide="1" frame="none" id="v4l2-format-sdr"> | 80 | <table pgwide="1" frame="none" id="v4l2-format-sdr"> |
| 81 | <title>struct <structname>v4l2_format_sdr</structname></title> | 81 | <title>struct <structname>v4l2_sdr_format</structname></title> |
| 82 | <tgroup cols="3"> | 82 | <tgroup cols="3"> |
| 83 | &cs-str; | 83 | &cs-str; |
| 84 | <tbody valign="top"> | 84 | <tbody valign="top"> |
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 6536e15c45e5..d9113cc71c77 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
| @@ -246,7 +246,7 @@ static void v4l_print_format(const void *arg, bool write_only) | |||
| 246 | const struct v4l2_vbi_format *vbi; | 246 | const struct v4l2_vbi_format *vbi; |
| 247 | const struct v4l2_sliced_vbi_format *sliced; | 247 | const struct v4l2_sliced_vbi_format *sliced; |
| 248 | const struct v4l2_window *win; | 248 | const struct v4l2_window *win; |
| 249 | const struct v4l2_format_sdr *sdr; | 249 | const struct v4l2_sdr_format *sdr; |
| 250 | unsigned i; | 250 | unsigned i; |
| 251 | 251 | ||
| 252 | pr_cont("type=%s", prt_names(p->type, v4l2_type_names)); | 252 | pr_cont("type=%s", prt_names(p->type, v4l2_type_names)); |
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 35f4a060fafe..e35ad6ca1e8a 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h | |||
| @@ -1714,10 +1714,10 @@ struct v4l2_pix_format_mplane { | |||
| 1714 | } __attribute__ ((packed)); | 1714 | } __attribute__ ((packed)); |
| 1715 | 1715 | ||
| 1716 | /** | 1716 | /** |
| 1717 | * struct v4l2_format_sdr - SDR format definition | 1717 | * struct v4l2_sdr_format - SDR format definition |
| 1718 | * @pixelformat: little endian four character code (fourcc) | 1718 | * @pixelformat: little endian four character code (fourcc) |
| 1719 | */ | 1719 | */ |
| 1720 | struct v4l2_format_sdr { | 1720 | struct v4l2_sdr_format { |
| 1721 | __u32 pixelformat; | 1721 | __u32 pixelformat; |
| 1722 | __u8 reserved[28]; | 1722 | __u8 reserved[28]; |
| 1723 | } __attribute__ ((packed)); | 1723 | } __attribute__ ((packed)); |
| @@ -1740,7 +1740,7 @@ struct v4l2_format { | |||
| 1740 | struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */ | 1740 | struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */ |
| 1741 | struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */ | 1741 | struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */ |
| 1742 | struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */ | 1742 | struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */ |
| 1743 | struct v4l2_format_sdr sdr; /* V4L2_BUF_TYPE_SDR_CAPTURE */ | 1743 | struct v4l2_sdr_format sdr; /* V4L2_BUF_TYPE_SDR_CAPTURE */ |
| 1744 | __u8 raw_data[200]; /* user-defined */ | 1744 | __u8 raw_data[200]; /* user-defined */ |
| 1745 | } fmt; | 1745 | } fmt; |
| 1746 | }; | 1746 | }; |
