Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c5d8933 authored by Thaissa Falbo's avatar Thaissa Falbo Committed by Greg Kroah-Hartman
Browse files

staging:media:davinci_vpfe: Fixed block comments according to kernel coding style 



Fixed block comments by following the checkpatch warnings

WARNING: Block comments use * on subsequent lines
WARNING: Block comments use a trailing */ on separate line

Signed-off-by: default avatarThaissa Falbo <thaissa.falbo@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72a5f6a8

drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h

+2 −2
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ struct vpfe_isif_raw_config { 
};



/**********************************************************************

      IPIPE API Structures

 *	IPIPE API Structures

 **********************************************************************/



/* IPIPE module configurations */

drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c

+8 −4
Original line number Diff line number Diff line
@@ -682,8 +682,10 @@ ipipe_set_rgb2rgb_regs(void __iomem *base_addr, unsigned int id, 
	ipipe_clock_enable(base_addr);



	if (id == IPIPE_RGB2RGB_2) {

		/* For second RGB module, gain integer is 3 bits instead

		of 4, offset has 11 bits insread of 13 */

		/*

		 * For second RGB module, gain integer is 3 bits instead

		 * of 4, offset has 11 bits insread of 13

		 */

		offset = RGB2_MUL_BASE;

		integ_mask = 0x7;

		offset_mask = RGB2RGB_2_OFST_MASK;
@@ -792,8 +794,10 @@ ipipe_set_3d_lut_regs(void __iomem *base_addr, void __iomem *isp5_base_addr, 
	/* valied table */

	tbl = lut_3d->table;

	for (i = 0; i < VPFE_IPIPE_MAX_SIZE_3D_LUT; i++) {

		/* Each entry has 0-9 (B), 10-19 (G) and

		20-29 R values */

		/*

		 * Each entry has 0-9 (B), 10-19 (G) and

		 * 20-29 R values

		 */

		val = tbl[i].b & D3_LUT_ENTRY_MASK;

		val |= (tbl[i].g & D3_LUT_ENTRY_MASK) <<

			 D3_LUT_ENTRY_G_SHIFT;

drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h

+4 −3
Original line number Diff line number Diff line
@@ -278,8 +278,9 @@ 
/* Resizer Rescale Parameters */

#define RSZ_EN_A		0x58

#define RSZ_EN_B		0xe8

/* offset of the registers to be added with base register of

   either RSZ0 or RSZ1

/*

 * offset of the registers to be added with base register of

 * either RSZ0 or RSZ1

 */

#define RSZ_MODE		0x4

#define RSZ_420			0x8

drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c

+4 −2
Original line number Diff line number Diff line
@@ -442,8 +442,10 @@ static int vpfe_register_entities(struct vpfe_device *vpfe_dev) 


	/* create links now, starting with external(i2c) entities */

	for (i = 0; i < vpfe_dev->num_ext_subdevs; i++)

		/* if entity has no pads (ex: amplifier),

		   cant establish link */

		/*

		 * if entity has no pads (ex: amplifier),

		 * cant establish link

		 */

		if (vpfe_dev->sd[i]->entity.num_pads) {

			ret = media_create_pad_link(&vpfe_dev->sd[i]->entity,

				0, &vpfe_dev->vpfe_isif.subdev.entity,

drivers/staging/media/davinci_vpfe/vpfe_video.c

+13 −9
Original line number Diff line number Diff line
@@ -178,8 +178,9 @@ static int vpfe_update_pipe_state(struct vpfe_video_device *video) 
	if (ret)

		return ret;



	/* Find out if there is any input video

	  if yes, it is single shot.

	/*

	 * Find out if there is any input video

	 * if yes, it is single shot.

	 */

	if (pipe->input_num == 0) {

		pipe->state = VPFE_PIPELINE_STREAM_CONTINUOUS;
@@ -529,9 +530,10 @@ static int vpfe_release(struct file *file) 
	if (fh->io_allowed) {

		if (video->started) {

			vpfe_stop_capture(video);

			/* mark pipe state as stopped in vpfe_release(),

			   as app might call streamon() after streamoff()

			   in which case driver has to start streaming.

			/*

			 * mark pipe state as stopped in vpfe_release(),

			 * as app might call streamon() after streamoff()

			 * in which case driver has to start streaming.

			 */

			video->pipe.state = VPFE_PIPELINE_STREAM_STOPPED;

			vb2_streamoff(&video->buffer_queue,
@@ -672,8 +674,10 @@ static int vpfe_enum_fmt(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_enum_fmt\n");



	/* since already subdev pad format is set,

	only one pixel format is available */

	/*

	 * since already subdev pad format is set,

	 * only one pixel format is available

	 */

	if (fmt->index > 0) {

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid index\n");

		return -EINVAL;