summaryrefslogtreecommitdiff
path: root/drivers/media/platform/rcar-vin
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>2017-05-23 21:15:36 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-06 14:45:39 -0300
commitbd8448f732f15b4b160fa8fe200305240c704deb (patch)
tree3010c8da7ff31c81f34683c91a90a56bcffcbf85 /drivers/media/platform/rcar-vin
parent82ec4ca9b5c3b1410e2f068d3fbdd41a51c35baf (diff)
[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 <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/rcar-vin')
-rw-r--r--drivers/media/platform/rcar-vin/rcar-dma.c9
1 files changed, 2 insertions, 7 deletions
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);