Linux kernel staging patches
 help / color / mirror / Atom feed
* [PATCH v3] staging: media: zoran: remove and move statement in next line with '*'
@ 2021-04-09 11:40 Mitali Borkar
  2021-04-13 14:28 ` Hans Verkuil
  0 siblings, 1 reply; 2+ messages in thread
From: Mitali Borkar @ 2021-04-09 11:40 UTC (permalink / raw)
  To: clabbe, mchehab, gregkh
  Cc: linux-media, linux-staging, linux-kernel, outreachy-kernel,
	mitali_s

Removed and moved statement in line in long(multi-line) comments and
added '*' before it to meet linux kernel coding style for long (multi-line) comments

Signed-off-by: Mitali Borkar <mitaliborkar810@gmail.com>
---

Changes from v2:- made style changes in code according to linux kernel
coding style for long comments.

drivers/staging/media/zoran/zr36050.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c
index 703064009c6b..b89afa239b0c 100644
--- a/drivers/staging/media/zoran/zr36050.c
+++ b/drivers/staging/media/zoran/zr36050.c
@@ -24,7 +24,8 @@
 /* codec io API */
 #include "videocodec.h"
 
-/* it doesn't make sense to have more than 20 or so,
+/*
+ * it doesn't make sense to have more than 20 or so,
  * just to prevent some unwanted loops
  */
 #define MAX_CODECS 20
@@ -311,7 +312,8 @@ static const char zr36050_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };
 
 /* ------------------------------------------------------------------------- */
 
-/* SOF (start of frame) segment depends on width, height and sampling ratio
+/*
+ * SOF (start of frame) segment depends on width, height and sampling ratio
  *			 of each color component
  */
 
@@ -343,7 +345,8 @@ static int zr36050_set_sof(struct zr36050 *ptr)
 
 /* ------------------------------------------------------------------------- */
 
-/* SOS (start of scan) segment depends on the used scan components
+/*
+ * SOS (start of scan) segment depends on the used scan components
  *			of each color component
  */
 
@@ -432,7 +435,8 @@ static void zr36050_init(struct zr36050 *ptr)
 		sum += zr36050_set_sos(ptr);
 		sum += zr36050_set_dri(ptr);
 
-		/* setup the fixed jpeg tables - maybe variable, though -
+		/*
+		 * setup the fixed jpeg tables - maybe variable, though -
 		 * (see table init section above)
 		 */
 		dprintk(3, "%s: write DQT, DHT, APP\n", ptr->name);
@@ -551,8 +555,9 @@ static void zr36050_init(struct zr36050 *ptr)
  * =========================================================================
  */
 
-/* set compression/expansion mode and launches codec -
- *  this should be the last call from the master before starting processing
+/*
+ * set compression/expansion mode and launches codec -
+ * this should be the last call from the master before starting processing
  */
 
 static int zr36050_set_mode(struct videocodec *codec, int mode)
@@ -581,7 +586,8 @@ static int zr36050_set_video(struct videocodec *codec, const struct tvnorm *norm
 		ptr->name, norm->h_start, norm->v_start,
 		cap->x, cap->y, cap->width, cap->height,
 		cap->decimation, cap->quality);
-	/* if () return -EINVAL;
+	/*
+	 * if () return -EINVAL;
 	 * trust the master driver that it knows what it does - so
 	 * we allow invalid startx/y and norm for now ...
 	 */
@@ -603,7 +609,8 @@ static int zr36050_set_video(struct videocodec *codec, const struct tvnorm *norm
 
 	ptr->real_code_vol = size >> 3; /* in bytes */
 
-	/* Set max_block_vol here (previously in zr36050_init, moved
+	/*
+	 * Set max_block_vol here (previously in zr36050_init, moved
 	 * here for consistency with zr36060 code
 	 */
 	zr36050_write(ptr, ZR050_MBCV, ptr->max_block_vol);
@@ -661,7 +668,8 @@ static int zr36050_control(struct videocodec *codec, int type, int size, void *d
 		if (size != sizeof(int))
 			return -EFAULT;
 		ptr->total_code_vol = *ival;
-		/* (Kieran Morrissey)
+		/*
+		 * (Kieran Morrissey)
 		 * code copied from zr36060.c to ensure proper bitrate
 		 */
 		ptr->real_code_vol = (ptr->total_code_vol * 6) >> 3;
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] staging: media: zoran: remove and move statement in next line with '*'
  2021-04-09 11:40 [PATCH v3] staging: media: zoran: remove and move statement in next line with '*' Mitali Borkar
@ 2021-04-13 14:28 ` Hans Verkuil
  0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2021-04-13 14:28 UTC (permalink / raw)
  To: Mitali Borkar, clabbe, mchehab, gregkh
  Cc: linux-media, linux-staging, linux-kernel, outreachy-kernel,
	mitali_s

On 09/04/2021 13:40, Mitali Borkar wrote:
> Removed and moved statement in line in long(multi-line) comments and
> added '*' before it to meet linux kernel coding style for long (multi-line) comments
> 
> Signed-off-by: Mitali Borkar <mitaliborkar810@gmail.com>
> ---
> 
> Changes from v2:- made style changes in code according to linux kernel
> coding style for long comments.
> 
> drivers/staging/media/zoran/zr36050.c | 26 +++++++++++++++++---------
>  1 file changed, 17 insertions(+), 9 deletions(-)

This too sits on top of other commits from your own private branch, so
it won't apply against the mainline code.

Regards,

	Hans

> 
> diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c
> index 703064009c6b..b89afa239b0c 100644
> --- a/drivers/staging/media/zoran/zr36050.c
> +++ b/drivers/staging/media/zoran/zr36050.c
> @@ -24,7 +24,8 @@
>  /* codec io API */
>  #include "videocodec.h"
>  
> -/* it doesn't make sense to have more than 20 or so,
> +/*
> + * it doesn't make sense to have more than 20 or so,
>   * just to prevent some unwanted loops
>   */
>  #define MAX_CODECS 20
> @@ -311,7 +312,8 @@ static const char zr36050_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };
>  
>  /* ------------------------------------------------------------------------- */
>  
> -/* SOF (start of frame) segment depends on width, height and sampling ratio
> +/*
> + * SOF (start of frame) segment depends on width, height and sampling ratio
>   *			 of each color component
>   */
>  
> @@ -343,7 +345,8 @@ static int zr36050_set_sof(struct zr36050 *ptr)
>  
>  /* ------------------------------------------------------------------------- */
>  
> -/* SOS (start of scan) segment depends on the used scan components
> +/*
> + * SOS (start of scan) segment depends on the used scan components
>   *			of each color component
>   */
>  
> @@ -432,7 +435,8 @@ static void zr36050_init(struct zr36050 *ptr)
>  		sum += zr36050_set_sos(ptr);
>  		sum += zr36050_set_dri(ptr);
>  
> -		/* setup the fixed jpeg tables - maybe variable, though -
> +		/*
> +		 * setup the fixed jpeg tables - maybe variable, though -
>  		 * (see table init section above)
>  		 */
>  		dprintk(3, "%s: write DQT, DHT, APP\n", ptr->name);
> @@ -551,8 +555,9 @@ static void zr36050_init(struct zr36050 *ptr)
>   * =========================================================================
>   */
>  
> -/* set compression/expansion mode and launches codec -
> - *  this should be the last call from the master before starting processing
> +/*
> + * set compression/expansion mode and launches codec -
> + * this should be the last call from the master before starting processing
>   */
>  
>  static int zr36050_set_mode(struct videocodec *codec, int mode)
> @@ -581,7 +586,8 @@ static int zr36050_set_video(struct videocodec *codec, const struct tvnorm *norm
>  		ptr->name, norm->h_start, norm->v_start,
>  		cap->x, cap->y, cap->width, cap->height,
>  		cap->decimation, cap->quality);
> -	/* if () return -EINVAL;
> +	/*
> +	 * if () return -EINVAL;
>  	 * trust the master driver that it knows what it does - so
>  	 * we allow invalid startx/y and norm for now ...
>  	 */
> @@ -603,7 +609,8 @@ static int zr36050_set_video(struct videocodec *codec, const struct tvnorm *norm
>  
>  	ptr->real_code_vol = size >> 3; /* in bytes */
>  
> -	/* Set max_block_vol here (previously in zr36050_init, moved
> +	/*
> +	 * Set max_block_vol here (previously in zr36050_init, moved
>  	 * here for consistency with zr36060 code
>  	 */
>  	zr36050_write(ptr, ZR050_MBCV, ptr->max_block_vol);
> @@ -661,7 +668,8 @@ static int zr36050_control(struct videocodec *codec, int type, int size, void *d
>  		if (size != sizeof(int))
>  			return -EFAULT;
>  		ptr->total_code_vol = *ival;
> -		/* (Kieran Morrissey)
> +		/*
> +		 * (Kieran Morrissey)
>  		 * code copied from zr36060.c to ensure proper bitrate
>  		 */
>  		ptr->real_code_vol = (ptr->total_code_vol * 6) >> 3;
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-13 14:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 11:40 [PATCH v3] staging: media: zoran: remove and move statement in next line with '*' Mitali Borkar
2021-04-13 14:28 ` Hans Verkuil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).