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>

diff --git a/drivers/media/platform/vicodec/vicodec-codec.c b/drivers/media/platform/vicodec/vicodec-codec.c
index e880a6c5747fa37c3533f7b53b04b8d523f97b16..2d047646f6147e74f04f9cf6ebcd877ac40e554a 100644 (file)
--- a/drivers/media/platform/vicodec/vicodec-codec.c
+++ b/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);