media: tegra-vde: Refactor timeout handling

Reorder the branches a bit, so cocci stops complaining about the code.

drivers/media/platform/nvidia/tegra-vde/h264.c:645:20-21: WARNING opportunity for min()

Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-20-3c4865f5a4b0@chromium.org
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/nvidia/tegra-vde/h264.c b/drivers/media/platform/nvidia/tegra-vde/h264.c
index 204e474d57f77739b02256315d383c2fb5612b35..cfea5572a1b8d3c2256a962ac422ecc72ea0e005 100644 (file)
--- a/drivers/media/platform/nvidia/tegra-vde/h264.c
+++ b/drivers/media/platform/nvidia/tegra-vde/h264.c
@@ -633,7 +633,9 @@ static int tegra_vde_decode_end(struct tegra_vde *vde)
 
        timeout = wait_for_completion_interruptible_timeout(
                        &vde->decode_completion, msecs_to_jiffies(1000));
-       if (timeout == 0) {
+       if (timeout < 0) {
+               ret = timeout;
+       } else if (timeout == 0) {
                bsev_ptr = tegra_vde_readl(vde, vde->bsev, 0x10);
                macroblocks_nb = tegra_vde_readl(vde, vde->sxe, 0xC8) & 0x1FFF;
                read_bytes = bsev_ptr ? bsev_ptr - vde->bitstream_data_addr : 0;
@@ -642,8 +644,6 @@ static int tegra_vde_decode_end(struct tegra_vde *vde)
                        read_bytes, macroblocks_nb);
 
                ret = -EIO;
-       } else if (timeout < 0) {
-               ret = timeout;
        } else {
                ret = 0;
        }