[media] v4l: vsp1: Remove unneeded entity streaming flag

The flag is set but never read, remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/vsp1/vsp1_bru.c b/drivers/media/platform/vsp1/vsp1_bru.c
index 27a9043b11e2ba61eac19e789658f1950e48a20f..74cc4903e858cbbcb42ec3305684c1b20e807ced 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_bru.c
+++ b/drivers/media/platform/vsp1/vsp1_bru.c
@@ -67,8 +67,6 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
        unsigned int flags;
        unsigned int i;
 
-       vsp1_entity_set_streaming(&bru->entity, enable);
-
        if (!enable)
                return 0;
 

diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
index 6b425ae9aba373cfa00eda7b518250651dc3394d..be67727f6f78ee047c1aa8f416dc9696499acf84 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_entity.c
+++ b/drivers/media/platform/vsp1/vsp1_entity.c
@@ -33,27 +33,6 @@ void vsp1_mod_write(struct vsp1_entity *e, u32 reg, u32 data)
                vsp1_write(e->vsp1, reg, data);
 }
 
-bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
-{
-       unsigned long flags;
-       bool streaming;
-
-       spin_lock_irqsave(&entity->lock, flags);
-       streaming = entity->streaming;
-       spin_unlock_irqrestore(&entity->lock, flags);
-
-       return streaming;
-}
-
-void vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&entity->lock, flags);
-       entity->streaming = streaming;
-       spin_unlock_irqrestore(&entity->lock, flags);
-}
-
 void vsp1_entity_route_setup(struct vsp1_entity *source)
 {
        struct vsp1_entity *sink;
@@ -198,8 +177,6 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
        if (i == ARRAY_SIZE(vsp1_routes))
                return -EINVAL;
 
-       spin_lock_init(&entity->lock);
-
        entity->vsp1 = vsp1;
        entity->source_pad = num_pads - 1;
 

diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/platform/vsp1/vsp1_entity.h
index c0d6db82ebfb7c8ddbc4a6f3ffcb53331d7ca5fa..203872164f8e61a4ea55d31e3796eee115f79d53 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_entity.h
+++ b/drivers/media/platform/vsp1/vsp1_entity.h
@@ -73,9 +73,6 @@ struct vsp1_entity {
 
        struct v4l2_subdev subdev;
        struct v4l2_mbus_framefmt *formats;
-
-       spinlock_t lock;                /* Protects the streaming field */
-       bool streaming;
 };
 
 static inline struct vsp1_entity *to_vsp1_entity(struct v4l2_subdev *subdev)
@@ -100,9 +97,6 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity,
 void vsp1_entity_init_formats(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_pad_config *cfg);
 
-bool vsp1_entity_is_streaming(struct vsp1_entity *entity);
-void vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming);
-
 void vsp1_entity_route_setup(struct vsp1_entity *source);
 
 void vsp1_mod_write(struct vsp1_entity *e, u32 reg, u32 data);

diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
index 62d898c0ad659955d14db81df715f12e626e3cfa..ffe097b27a7727158be49fe9d12c58a8e4d7224b 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rpf.c
@@ -46,8 +46,6 @@ static int rpf_s_stream(struct v4l2_subdev *subdev, int enable)
        u32 pstride;
        u32 infmt;
 
-       vsp1_entity_set_streaming(&rpf->entity, enable);
-
        if (!enable)
                return 0;
 

diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index 810c6b376e14516ec96dbdccb4d8b7973d307970..371b20ec5d1bfd7dac1c0e2c78b4860ec7e0b05b 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -114,8 +114,6 @@ static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
        struct v4l2_mbus_framefmt *output;
        u32 ctrl0;
 
-       vsp1_entity_set_streaming(&sru->entity, enable);
-
        if (!enable)
                return 0;
 

diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index 28654cffeecaab57ce723dd1f9b7bc8dc6b4d380..1013190e440b250ab45d01fe9cd58bcf1e7717b9 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -47,8 +47,6 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
        u32 srcrpf = 0;
        u32 outfmt = 0;
 
-       vsp1_entity_set_streaming(&wpf->entity, enable);
-
        if (!enable) {
                vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0);
                vsp1_write(vsp1, wpf->entity.index * VI6_WPF_OFFSET +