Skip to content

L
linux
Commit ee8defec authored by Piotr S. Staszewski's avatar Piotr S. Staszewski Committed by Mauro Carvalho Chehab
Browse files
Options

[media] staging: media: omap4iss: Reformat overly long lines 

This reformats lines that were previously above 80 characters long,
improving readability and making checkpatch.pl happier.
Signed-off-by: default avatarPiotr S. Staszewski <p.staszewski@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 34668350
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 24 deletions
drivers/staging/media/omap4iss/iss_csi2.c
View file @ ee8defec
...@@ -828,8 +828,10 @@ static const struct iss_video_operations csi2_issvideo_ops = { ...@@ -828,8 +828,10 @@ static const struct iss_video_operations csi2_issvideo_ops = {
*/ */
static struct v4l2_mbus_framefmt * static struct v4l2_mbus_framefmt *
__csi2_get_format(struct iss_csi2_device *csi2, struct v4l2_subdev_pad_config *cfg, __csi2_get_format(struct iss_csi2_device *csi2,
unsigned int pad, enum v4l2_subdev_format_whence which) struct v4l2_subdev_pad_config *cfg,
unsigned int pad,
enum v4l2_subdev_format_whence which)
{ {
if (which == V4L2_SUBDEV_FORMAT_TRY) if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(&csi2->subdev, cfg, pad); return v4l2_subdev_get_try_format(&csi2->subdev, cfg, pad);
...@@ -838,8 +840,10 @@ __csi2_get_format(struct iss_csi2_device *csi2, struct v4l2_subdev_pad_config *c ...@@ -838,8 +840,10 @@ __csi2_get_format(struct iss_csi2_device *csi2, struct v4l2_subdev_pad_config *c
} }
static void static void
csi2_try_format(struct iss_csi2_device *csi2, struct v4l2_subdev_pad_config *cfg, csi2_try_format(struct iss_csi2_device *csi2,
unsigned int pad, struct v4l2_mbus_framefmt *fmt, struct v4l2_subdev_pad_config *cfg,
unsigned int pad,
struct v4l2_mbus_framefmt *fmt,
enum v4l2_subdev_format_whence which) enum v4l2_subdev_format_whence which)
{ {
u32 pixelcode; u32 pixelcode;
...@@ -967,7 +971,8 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd, ...@@ -967,7 +971,8 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd,
* @fmt: pointer to v4l2 subdev format structure * @fmt: pointer to v4l2 subdev format structure
* return -EINVAL or zero on success * return -EINVAL or zero on success
*/ */
static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int csi2_get_format(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_format *fmt)
{ {
struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd); struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd);
...@@ -988,7 +993,8 @@ static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config ...@@ -988,7 +993,8 @@ static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config
* @fmt: pointer to v4l2 subdev format structure * @fmt: pointer to v4l2 subdev format structure
* return -EINVAL or zero on success * return -EINVAL or zero on success
*/ */
static int csi2_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int csi2_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_format *fmt)
{ {
struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd); struct iss_csi2_device *csi2 = v4l2_get_subdevdata(sd);
......
drivers/staging/media/omap4iss/iss_ipipe.c
View file @ ee8defec
...@@ -24,8 +24,10 @@ ...@@ -24,8 +24,10 @@
#include "iss_ipipe.h" #include "iss_ipipe.h"
static struct v4l2_mbus_framefmt * static struct v4l2_mbus_framefmt *
__ipipe_get_format(struct iss_ipipe_device *ipipe, struct v4l2_subdev_pad_config *cfg, __ipipe_get_format(struct iss_ipipe_device *ipipe,
unsigned int pad, enum v4l2_subdev_format_whence which); struct v4l2_subdev_pad_config *cfg,
unsigned int pad,
enum v4l2_subdev_format_whence which);
static const unsigned int ipipe_fmts[] = { static const unsigned int ipipe_fmts[] = {
MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGRBG10_1X10,
...@@ -176,8 +178,10 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) ...@@ -176,8 +178,10 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
} }
static struct v4l2_mbus_framefmt * static struct v4l2_mbus_framefmt *
__ipipe_get_format(struct iss_ipipe_device *ipipe, struct v4l2_subdev_pad_config *cfg, __ipipe_get_format(struct iss_ipipe_device *ipipe,
unsigned int pad, enum v4l2_subdev_format_whence which) struct v4l2_subdev_pad_config *cfg,
unsigned int pad,
enum v4l2_subdev_format_whence which)
{ {
if (which == V4L2_SUBDEV_FORMAT_TRY) if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(&ipipe->subdev, cfg, pad); return v4l2_subdev_get_try_format(&ipipe->subdev, cfg, pad);
...@@ -193,9 +197,11 @@ __ipipe_get_format(struct iss_ipipe_device *ipipe, struct v4l2_subdev_pad_config ...@@ -193,9 +197,11 @@ __ipipe_get_format(struct iss_ipipe_device *ipipe, struct v4l2_subdev_pad_config
* @fmt: Format * @fmt: Format
*/ */
static void static void
ipipe_try_format(struct iss_ipipe_device *ipipe, struct v4l2_subdev_pad_config *cfg, ipipe_try_format(struct iss_ipipe_device *ipipe,
unsigned int pad, struct v4l2_mbus_framefmt *fmt, struct v4l2_subdev_pad_config *cfg,
enum v4l2_subdev_format_whence which) unsigned int pad,
struct v4l2_mbus_framefmt *fmt,
enum v4l2_subdev_format_whence which)
{ {
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
unsigned int width = fmt->width; unsigned int width = fmt->width;
...@@ -306,8 +312,9 @@ static int ipipe_enum_frame_size(struct v4l2_subdev *sd, ...@@ -306,8 +312,9 @@ static int ipipe_enum_frame_size(struct v4l2_subdev *sd,
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int ipipe_get_format(struct v4l2_subdev *sd,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt)
{ {
struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
...@@ -329,8 +336,9 @@ static int ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_confi ...@@ -329,8 +336,9 @@ static int ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_confi
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int ipipe_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt)
{ {
struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
......
drivers/staging/media/omap4iss/iss_ipipeif.c
View file @ ee8defec
...@@ -518,8 +518,9 @@ static int ipipeif_enum_frame_size(struct v4l2_subdev *sd, ...@@ -518,8 +518,9 @@ static int ipipeif_enum_frame_size(struct v4l2_subdev *sd,
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int ipipeif_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int ipipeif_get_format(struct v4l2_subdev *sd,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt)
{ {
struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd); struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
...@@ -541,8 +542,9 @@ static int ipipeif_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con ...@@ -541,8 +542,9 @@ static int ipipeif_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int ipipeif_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int ipipeif_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt)
{ {
struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd); struct iss_ipipeif_device *ipipeif = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
......
drivers/staging/media/omap4iss/iss_resizer.c
View file @ ee8defec
...@@ -580,8 +580,9 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd, ...@@ -580,8 +580,9 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd,
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int resizer_get_format(struct v4l2_subdev *sd,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt)
{ {
struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd); struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
...@@ -603,7 +604,8 @@ static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con ...@@ -603,7 +604,8 @@ static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
* Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
* to the format type. * to the format type.
*/ */
static int resizer_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, static int resizer_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_format *fmt)
{ {
struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd); struct iss_resizer_device *resizer = v4l2_get_subdevdata(sd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7