[v9,1/3] media: tpg: change char argument to const char
diff mbox series

Message ID 20200701132940.21257-2-kgupta@es.iitr.ac.in
State New
Headers show
Series
  • media: Add colors' order and other info over test image
Related show

Commit Message

Kaaira Gupta July 1, 2020, 1:29 p.m. UTC
Change the argument of type char * to const char * for function
tpg_gen_text().

This function should take in a const char pointer as opposed to a char
* as there is no modification. This issue was found while passing the 
order of colors of tpg generated test image (which is a const char *)
to this function.

Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
Reviewed-by: Helen Koike <helen.koike@collabora.com>
---
 drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 10 +++++-----
 include/media/tpg/v4l2-tpg.h                  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Kieran Bingham July 1, 2020, 11:08 p.m. UTC | #1
Hi Kaaira,

On 01/07/2020 14:29, Kaaira Gupta wrote:
> Change the argument of type char * to const char * for function
> tpg_gen_text().
> 
> This function should take in a const char pointer as opposed to a char
> * as there is no modification. This issue was found while passing the 
> order of colors of tpg generated test image (which is a const char *)
> to this function.
> 
> Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
> Reviewed-by: Helen Koike <helen.koike@collabora.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 10 +++++-----
>  include/media/tpg/v4l2-tpg.h                  |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> index 50f1e0b28b25..dde22a4cbd6c 100644
> --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
> @@ -1927,34 +1927,34 @@ typedef struct { u16 __; u8 _; } __packed x24;
>  
>  static noinline void tpg_print_str_2(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
>  			unsigned p, unsigned first, unsigned div, unsigned step,
> -			int y, int x, char *text, unsigned len)
> +			int y, int x, const char *text, unsigned len)
>  {
>  	PRINTSTR(u8);
>  }
>  
>  static noinline void tpg_print_str_4(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
>  			unsigned p, unsigned first, unsigned div, unsigned step,
> -			int y, int x, char *text, unsigned len)
> +			int y, int x, const char *text, unsigned len)
>  {
>  	PRINTSTR(u16);
>  }
>  
>  static noinline void tpg_print_str_6(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
>  			unsigned p, unsigned first, unsigned div, unsigned step,
> -			int y, int x, char *text, unsigned len)
> +			int y, int x, const char *text, unsigned len)
>  {
>  	PRINTSTR(x24);
>  }
>  
>  static noinline void tpg_print_str_8(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
>  			unsigned p, unsigned first, unsigned div, unsigned step,
> -			int y, int x, char *text, unsigned len)
> +			int y, int x, const char *text, unsigned len)
>  {
>  	PRINTSTR(u32);
>  }
>  
>  void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
> -		  int y, int x, char *text)
> +		  int y, int x, const char *text)
>  {
>  	unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1;
>  	unsigned div = step;
> diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
> index eb191e85d363..9749ed409856 100644
> --- a/include/media/tpg/v4l2-tpg.h
> +++ b/include/media/tpg/v4l2-tpg.h
> @@ -241,7 +241,7 @@ void tpg_log_status(struct tpg_data *tpg);
>  
>  void tpg_set_font(const u8 *f);
>  void tpg_gen_text(const struct tpg_data *tpg,
> -		u8 *basep[TPG_MAX_PLANES][2], int y, int x, char *text);
> +		u8 *basep[TPG_MAX_PLANES][2], int y, int x, const char *text);
>  void tpg_calc_text_basep(struct tpg_data *tpg,
>  		u8 *basep[TPG_MAX_PLANES][2], unsigned p, u8 *vbuf);
>  unsigned tpg_g_interleaved_plane(const struct tpg_data *tpg, unsigned buf_line);
>

Patch
diff mbox series

diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
index 50f1e0b28b25..dde22a4cbd6c 100644
--- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
+++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
@@ -1927,34 +1927,34 @@  typedef struct { u16 __; u8 _; } __packed x24;
 
 static noinline void tpg_print_str_2(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
 			unsigned p, unsigned first, unsigned div, unsigned step,
-			int y, int x, char *text, unsigned len)
+			int y, int x, const char *text, unsigned len)
 {
 	PRINTSTR(u8);
 }
 
 static noinline void tpg_print_str_4(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
 			unsigned p, unsigned first, unsigned div, unsigned step,
-			int y, int x, char *text, unsigned len)
+			int y, int x, const char *text, unsigned len)
 {
 	PRINTSTR(u16);
 }
 
 static noinline void tpg_print_str_6(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
 			unsigned p, unsigned first, unsigned div, unsigned step,
-			int y, int x, char *text, unsigned len)
+			int y, int x, const char *text, unsigned len)
 {
 	PRINTSTR(x24);
 }
 
 static noinline void tpg_print_str_8(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
 			unsigned p, unsigned first, unsigned div, unsigned step,
-			int y, int x, char *text, unsigned len)
+			int y, int x, const char *text, unsigned len)
 {
 	PRINTSTR(u32);
 }
 
 void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2],
-		  int y, int x, char *text)
+		  int y, int x, const char *text)
 {
 	unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1;
 	unsigned div = step;
diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
index eb191e85d363..9749ed409856 100644
--- a/include/media/tpg/v4l2-tpg.h
+++ b/include/media/tpg/v4l2-tpg.h
@@ -241,7 +241,7 @@  void tpg_log_status(struct tpg_data *tpg);
 
 void tpg_set_font(const u8 *f);
 void tpg_gen_text(const struct tpg_data *tpg,
-		u8 *basep[TPG_MAX_PLANES][2], int y, int x, char *text);
+		u8 *basep[TPG_MAX_PLANES][2], int y, int x, const char *text);
 void tpg_calc_text_basep(struct tpg_data *tpg,
 		u8 *basep[TPG_MAX_PLANES][2], unsigned p, u8 *vbuf);
 unsigned tpg_g_interleaved_plane(const struct tpg_data *tpg, unsigned buf_line);