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

Commit 7f6eb118 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] gspca_main: Remove no longer used users variable 



Remove the no longer used / useful users variable, and with that gone
there also is no longer a need to take queue_lock in dev_open.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4a82bc60

drivers/media/video/gspca/gspca.c

+5 −27
Original line number Diff line number Diff line
@@ -1210,29 +1210,15 @@ static void gspca_release(struct video_device *vfd) 
static int dev_open(struct file *file)

{

	struct gspca_dev *gspca_dev;

	int ret;



	PDEBUG(D_STREAM, "[%s] open", current->comm);

	gspca_dev = (struct gspca_dev *) video_devdata(file);

	if (mutex_lock_interruptible(&gspca_dev->queue_lock))

		return -ERESTARTSYS;

	if (!gspca_dev->present) {

		ret = -ENODEV;

		goto out;

	}



	if (gspca_dev->users > 4) {	/* (arbitrary value) */

		ret = -EBUSY;

		goto out;

	}

	if (!gspca_dev->present)

		return -ENODEV;



	/* protect the subdriver against rmmod */

	if (!try_module_get(gspca_dev->module)) {

		ret = -ENODEV;

		goto out;

	}



	gspca_dev->users++;

	if (!try_module_get(gspca_dev->module))

		return -ENODEV;



	file->private_data = gspca_dev;

#ifdef GSPCA_DEBUG
@@ -1244,14 +1230,7 @@ static int dev_open(struct file *file) 
		gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL

					| V4L2_DEBUG_IOCTL_ARG);

#endif

	ret = 0;

out:

	mutex_unlock(&gspca_dev->queue_lock);

	if (ret != 0)

		PDEBUG(D_ERR|D_STREAM, "open failed err %d", ret);

	else

		PDEBUG(D_STREAM, "open done");

	return ret;

	return 0;

}



static int dev_close(struct file *file)
@@ -1261,7 +1240,6 @@ static int dev_close(struct file *file) 
	PDEBUG(D_STREAM, "[%s] close", current->comm);

	if (mutex_lock_interruptible(&gspca_dev->queue_lock))

		return -ERESTARTSYS;

	gspca_dev->users--;



	/* if the file did the capture, free the streaming resources */

	if (gspca_dev->capt_file == file) {

drivers/media/video/gspca/gspca.h

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ struct gspca_dev { 
#ifdef CONFIG_PM

	char frozen;			/* suspend - resume */

#endif

	char users;			/* number of opens */

	char present;			/* device connected */

	char nbufread;			/* number of buffers for read() */

	char memory;			/* memory type (V4L2_MEMORY_xxx) */