media: staging: hantro: avoid future namespace collisions

Rename:
	vp8_dec_mc_filter -> hantro_vp8_dec_mc_filter

As other drivers may end implementing something with the same
name.

So, prepend driver's name here, in order to make symbol namespace
cleaner.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
index 181e2f76d8cbc7b821118a9053d96dbb2582c8fb..6d99c2be01cf8ae3af046b1e1e52cb520d30f082 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
@@ -342,11 +342,12 @@ static void cfg_tap(struct hantro_ctx *ctx,
                return; /* Tap filter not used. */
 
        for (i = 0; i < 8; i++) {
-               val = (vp8_dec_mc_filter[i][0] << 2) | vp8_dec_mc_filter[i][5];
+               val = (hantro_vp8_dec_mc_filter[i][0] << 2) |
+                      hantro_vp8_dec_mc_filter[i][5];
 
                for (j = 0; j < 4; j++)
                        hantro_reg_write(vpu, &vp8_dec_pred_bc_tap[i][j],
-                                        vp8_dec_mc_filter[i][j + 1]);
+                                        hantro_vp8_dec_mc_filter[i][j + 1]);
 
                switch (i) {
                case 2:

diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
index e86c84fbfe1a3323fe7b9f2c1f2412173d8f0347..2b8029674a75066086d7ce2590c174f43460dc16 100644 (file)
--- a/drivers/staging/media/hantro/hantro_hw.h
+++ b/drivers/staging/media/hantro/hantro_hw.h
@@ -95,7 +95,7 @@ extern const struct hantro_variant rk3399_vpu_variant;
 extern const struct hantro_variant rk3328_vpu_variant;
 extern const struct hantro_variant rk3288_vpu_variant;
 
-extern const u32 vp8_dec_mc_filter[8][6];
+extern const u32 hantro_vp8_dec_mc_filter[8][6];
 
 void hantro_watchdog(struct work_struct *work);
 void hantro_run(struct hantro_ctx *ctx);

diff --git a/drivers/staging/media/hantro/hantro_vp8.c b/drivers/staging/media/hantro/hantro_vp8.c
index cd01661cac216c64651eeb4daf1f0885508962f6..0e02d147b189d644fc3936b02c51752770bf835b 100644 (file)
--- a/drivers/staging/media/hantro/hantro_vp8.c
+++ b/drivers/staging/media/hantro/hantro_vp8.c
@@ -35,7 +35,7 @@ struct vp8_prob_tbl_packed {
  * filter taps taken to 7-bit precision,
  * reference RFC6386#Page-16, filters[8][6]
  */
-const u32 vp8_dec_mc_filter[8][6] = {
+const u32 hantro_vp8_dec_mc_filter[8][6] = {
        { 0, 0, 128, 0, 0, 0 },
        { 0, -6, 123, 12, -1, 0 },
        { 2, -11, 108, 36, -8, 1 },

diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
index c5e9f8befe9c10e177467dfc2ab59a6dc2bd4b71..f17e32620b081b01870f78e1522adb2f8362b919 100644 (file)
--- a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
@@ -439,7 +439,7 @@ static void cfg_tap(struct hantro_ctx *ctx,
                        if (vp8_dec_pred_bc_tap[i][j].base != 0)
                                hantro_reg_write(vpu,
                                                 &vp8_dec_pred_bc_tap[i][j],
-                                                vp8_dec_mc_filter[i][j]);
+                                                hantro_vp8_dec_mc_filter[i][j]);
                }
        }
 }