From be306f841603b405d3e05da49532c54bb9f17dd9 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 27 Mar 2013 00:23:28 +0900 Subject: [PATCH] --- yaml --- r: 363759 b: refs/heads/master c: d88fe15b2d9993a594b6176f91eeb7f92d607d48 h: refs/heads/master i: 363757: 43493c50f8f2e02949f19731c5acd5554d5d475c 363755: 41dc413254c83824ec9ce7032e9cd63827a2f72e 363751: 7237fa55b3612da8afdf7b73557bf6b8a57cc1e5 363743: c4b95171188dfe1e59954c1c55f2f745674f9b3a v: v3 --- [refs] | 2 +- .../staging/media/davinci_vpfe/davinci-vpfe-mc.txt | 2 +- trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c | 6 +++--- trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c | 8 ++++---- trunk/drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5b4868538698..1c1f17b96e2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 318e16b920ce9ad84ee4f715aea7702dd72624ff +refs/heads/master: d88fe15b2d9993a594b6176f91eeb7f92d607d48 diff --git a/trunk/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt b/trunk/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt index 1dbd56418704..a1e91778aa9b 100644 --- a/trunk/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt +++ b/trunk/drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt @@ -38,7 +38,7 @@ interface to userspace. DAVINCI RESIZER A DAVINCI RESIZER B -Each possible link in the VPFE is modeled by a link in the Media controller +Each possible link in the VPFE is modelled by a link in the Media controller interface. For an example program see [1]. diff --git a/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c b/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c index ebeea72e176a..6d4a93c556e4 100644 --- a/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c +++ b/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c @@ -685,7 +685,7 @@ static void isif_config_bclamp(struct vpfe_isif_device *isif, val = (bc->bc_mode_color & ISIF_BC_MODE_COLOR_MASK) << ISIF_BC_MODE_COLOR_SHIFT; - /* Enable BC and horizontal clamp caculation paramaters */ + /* Enable BC and horizontal clamp calculation paramaters */ val = val | 1 | ((bc->horz.mode & ISIF_HORZ_BC_MODE_MASK) << ISIF_HORZ_BC_MODE_SHIFT); @@ -722,7 +722,7 @@ static void isif_config_bclamp(struct vpfe_isif_device *isif, isif_write(isif->isif_cfg.base_addr, val, CLHWIN2); } - /* vertical clamp caculation paramaters */ + /* vertical clamp calculation paramaters */ /* OB H Valid */ val = bc->vert.ob_h_sz_calc & ISIF_VERT_BC_OB_H_SZ_MASK; @@ -1569,7 +1569,7 @@ isif_pad_set_crop(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, crop->rect.width = format->width; crop->rect.height = format->height; } - /* adjust the width to 16 pixel boundry */ + /* adjust the width to 16 pixel boundary */ crop->rect.width = ((crop->rect.width + 15) & ~0xf); vpfe_isif->crop = crop->rect; if (crop->which == V4L2_SUBDEV_FORMAT_ACTIVE) { diff --git a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c index 99ccbebea598..c91d356c13df 100644 --- a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -357,7 +357,7 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe) * * Set the pipeline to the given stream state. * - * Return 0 if successfull, or the return value of the failed video::s_stream + * Return 0 if successful, or the return value of the failed video::s_stream * operation otherwise. */ static int vpfe_pipeline_set_stream(struct vpfe_pipeline *pipe, @@ -644,7 +644,7 @@ static int vpfe_g_fmt(struct file *file, void *priv, * fills v4l2_fmtdesc structure with output format set on adjacent subdev, * only one format is enumearted as subdevs are already configured * - * Return 0 if successfull, error code otherwise + * Return 0 if successful, error code otherwise */ static int vpfe_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *fmt) @@ -769,7 +769,7 @@ static int vpfe_try_fmt(struct file *file, void *priv, * fills v4l2_input structure with input available on media chain, * only one input is enumearted as media chain is setup by this time * - * Return 0 if successfull, -EINVAL is media chain is invalid + * Return 0 if successful, -EINVAL is media chain is invalid */ static int vpfe_enum_input(struct file *file, void *priv, struct v4l2_input *inp) @@ -779,7 +779,7 @@ static int vpfe_enum_input(struct file *file, void *priv, struct vpfe_device *vpfe_dev = video->vpfe_dev; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_enum_input\n"); - /* enumerate from the subdev user has choosen through mc */ + /* enumerate from the subdev user has chosen through mc */ if (inp->index < sdinfo->num_inputs) { memcpy(inp, &sdinfo->inputs[inp->index], sizeof(struct v4l2_input)); diff --git a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.h b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.h index bf8af01d4a1b..df0aeec8b588 100644 --- a/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.h +++ b/trunk/drivers/staging/media/davinci_vpfe/vpfe_video.h @@ -138,7 +138,7 @@ struct vpfe_video_device { v4l2_std_id stdid; /* * offset where second field starts from the starting of the - * buffer for field seperated YCbCr formats + * buffer for field separated YCbCr formats */ u32 field_off; };