Browse Source

media: vicodec: current -> cur

'current' is also defined in asm-generic/current.h.

When compiling this driver for older kernels with the media_build system,
this header is included via compat.h and it no longer compiles. Rename
current to cur.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Hans Verkuil 7 years ago
parent
commit
64004337d0
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/media/platform/vicodec/vicodec-codec.c

+ 2 - 2
drivers/media/platform/vicodec/vicodec-codec.c

@@ -555,7 +555,7 @@ static int var_inter(const s16 *old, const s16 *new)
 	return ret;
 }
 
-static int decide_blocktype(const u8 *current, const u8 *reference,
+static int decide_blocktype(const u8 *cur, const u8 *reference,
 			    s16 *deltablock, unsigned int stride,
 			    unsigned int input_step)
 {
@@ -566,7 +566,7 @@ static int decide_blocktype(const u8 *current, const u8 *reference,
 	int vari;
 	int vard;
 
-	fill_encoder_block(current, tmp, stride, input_step);
+	fill_encoder_block(cur, tmp, stride, input_step);
 	fill_encoder_block(reference, old, 8, 1);
 	vari = var_intra(tmp);