From: Niklas Söderlund Date: Wed, 24 May 2017 00:15:36 +0000 (-0300) Subject: [media] rcar-vin: refactor and fold in function after stall handling rework X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd8448f732f15b4b160fa8fe200305240c704deb;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] rcar-vin: refactor and fold in function after stall handling rework With the driver stopping and starting the stream each time the driver is stalled rvin_capture_off() can be folded in to the only caller. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c index ae4febede5f7..b136844499f6 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -397,12 +397,6 @@ static void rvin_capture_on(struct rvin_dev *vin) rvin_write(vin, VNFC_S_FRAME, VNFC_REG); } -static void rvin_capture_off(struct rvin_dev *vin) -{ - /* Set continuous & single transfer off */ - rvin_write(vin, 0, VNFC_REG); -} - static int rvin_capture_start(struct rvin_dev *vin) { struct rvin_buffer *buf, *node; @@ -436,7 +430,8 @@ static int rvin_capture_start(struct rvin_dev *vin) static void rvin_capture_stop(struct rvin_dev *vin) { - rvin_capture_off(vin); + /* Set continuous & single transfer off */ + rvin_write(vin, 0, VNFC_REG); /* Disable module */ rvin_write(vin, rvin_read(vin, VNMC_REG) & ~VNMC_ME, VNMC_REG);