Commit f8990669 authored by Wolfram Sang's avatar Wolfram Sang Committed by Hans Verkuil
Browse files

media: tegra-vde: use 'time_left' variable with wait_for_completion_interruptible_timeout() 



There is a confusing pattern in the kernel to use a variable named
'timeout' to store the result of
wait_for_completion_interruptible_timeout() causing patterns like:

        timeout = wait_for_completion_interruptible_timeout(...)
        if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the
code self explaining.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent b09b6f26

drivers/media/platform/nvidia/tegra-vde/h264.c

+5 −5
Original line number Diff line number Diff line
@@ -623,14 +623,14 @@ static int tegra_vde_decode_end(struct tegra_vde *vde) 
	unsigned int read_bytes, macroblocks_nb;

	struct device *dev = vde->dev;

	dma_addr_t bsev_ptr;

	long timeout;

	long time_left;

	int ret;



	timeout = wait_for_completion_interruptible_timeout(

	time_left = wait_for_completion_interruptible_timeout(

			&vde->decode_completion, msecs_to_jiffies(1000));

	if (timeout < 0) {

		ret = timeout;

	} else if (timeout == 0) {

	if (time_left < 0) {

		ret = time_left;

	} else if (time_left == 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;