Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c71778c authored by Tejun Heo's avatar Tejun Heo
Browse files

media/video: don't use flush_scheduled_work() 



This patch converts the remaining users of flush_scheduled_work() in
media/video.

* bttv-input.c and cx23885-input.c don't use workqueue at all.  No
  need to flush.

* Make omap24xxcam.c and saa7134-empress.c flush the used work
  directly.

* In fd_defio.c, replace cancel_delayed_work() +
  flush_scheduled_work() with cancel_delayed_work_sync().  While at
  it, replace the deprecated cancel_rearming_delayed_work() with
  cancel_delayed_work_sync().

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
parent 707bcf32

drivers/media/video/bt8xx/bttv-input.c

+1 −4
Original line number Diff line number Diff line
@@ -229,16 +229,13 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir) 


static void bttv_ir_stop(struct bttv *btv)

{

	if (btv->remote->polling) {

	if (btv->remote->polling)

		del_timer_sync(&btv->remote->timer);

		flush_scheduled_work();

	}



	if (btv->remote->rc5_gpio) {

		u32 gpio;



		del_timer_sync(&btv->remote->timer_end);

		flush_scheduled_work();



		gpio = bttv_gpio_read(&btv->c);

		bttv_gpio_write(&btv->c, gpio & ~(1 << 4));

drivers/media/video/cx23885/cx23885-input.c

+0 −2
Original line number Diff line number Diff line
@@ -230,8 +230,6 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev) 
		v4l2_subdev_call(dev->sd_ir, ir, rx_s_parameters, &params);

		v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params);

	}



	flush_scheduled_work();

}



static void cx23885_input_ir_close(void *priv)

drivers/media/video/omap24xxcam.c

+3 −3
Original line number Diff line number Diff line
@@ -1198,7 +1198,7 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i) 


	atomic_inc(&cam->reset_disable);



	flush_scheduled_work();

	flush_work_sync(&cam->sensor_reset_work);



	rval = videobuf_streamoff(q);

	if (!rval) {
@@ -1512,7 +1512,7 @@ static int omap24xxcam_release(struct file *file) 


	atomic_inc(&cam->reset_disable);



	flush_scheduled_work();

	flush_work_sync(&cam->sensor_reset_work);



	/* stop streaming capture */

	videobuf_streamoff(&fh->vbq);
@@ -1536,7 +1536,7 @@ static int omap24xxcam_release(struct file *file) 
	 * not be scheduled anymore since streaming is already

	 * disabled.)

	 */

	flush_scheduled_work();

	flush_work_sync(&cam->sensor_reset_work);



	mutex_lock(&cam->mutex);

	if (atomic_dec_return(&cam->users) == 0) {

drivers/media/video/saa7134/saa7134-empress.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int empress_fini(struct saa7134_dev *dev) 


	if (NULL == dev->empress_dev)

		return 0;

	flush_scheduled_work();

	flush_work_sync(&dev->empress_workqueue);

	video_unregister_device(dev->empress_dev);

	dev->empress_dev = NULL;

	return 0;