Merge tag 'ovl-update-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / drivers / gpu / ipu-v3 / ipu-image-convert.c

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c
index aa1d4b6..af16120 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -990,7 +990,7 @@ static int calc_tile_offsets_planar(struct ipu_image_convert_ctx *ctx,
        const struct ipu_image_pixfmt *fmt = image->fmt;
        unsigned int row, col, tile = 0;
        u32 H, top, y_stride, uv_stride;
-       u32 uv_row_off, uv_col_off, uv_off, u_off, v_off, tmp;
+       u32 uv_row_off, uv_col_off, uv_off, u_off, v_off;
        u32 y_row_off, y_col_off, y_off;
        u32 y_size, uv_size;
 
@@ -1021,11 +1021,8 @@ static int calc_tile_offsets_planar(struct ipu_image_convert_ctx *ctx,
 
                        u_off = y_size - y_off + uv_off;
                        v_off = (fmt->uv_packed) ? 0 : u_off + uv_size;
-                       if (fmt->uv_swapped) {
-                               tmp = u_off;
-                               u_off = v_off;
-                               v_off = tmp;
-                       }
+                       if (fmt->uv_swapped)
+                               swap(u_off, v_off);
 
                        image->tile[tile].offset = y_off;
                        image->tile[tile].u_off = u_off;