Commit 2f3d0025 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8777): tea575x-tuner: replace video_exclusive_open/release 



Move the video_exclusive_open/release functionality into the
driver itself.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3ca685aa

include/sound/tea575x-tuner.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct snd_tea575x { 
	unsigned int freq_fixup;	/* crystal onboard */

	unsigned int val;		/* hw value */

	unsigned long freq;		/* frequency */

	unsigned long in_use;		/* set if the device is in use */

	struct snd_tea575x_ops *ops;

	void *private_data;

};

sound/i2c/other/tea575x-tuner.c

+20 −2
Original line number Diff line number Diff line
@@ -175,6 +175,23 @@ static void snd_tea575x_release(struct video_device *vfd) 
{

}



static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)

{

	struct video_device *dev = video_devdata(file);

	struct snd_tea575x *tea = video_get_drvdata(dev);



	return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0;

}



static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file)

{

	struct video_device *dev = video_devdata(file);

	struct snd_tea575x *tea = video_get_drvdata(dev);



	clear_bit(0, &tea->in_use);

	return 0;

}



/*

 * initialize all the tea575x chips

 */
@@ -193,9 +210,10 @@ void snd_tea575x_init(struct snd_tea575x *tea) 
	tea->vd.release = snd_tea575x_release;

	video_set_drvdata(&tea->vd, tea);

	tea->vd.fops = &tea->fops;

	tea->in_use = 0;

	tea->fops.owner = tea->card->module;

	tea->fops.open = video_exclusive_open;

	tea->fops.release = video_exclusive_release;

	tea->fops.open = snd_tea575x_exclusive_open;

	tea->fops.release = snd_tea575x_exclusive_release;

	tea->fops.ioctl = snd_tea575x_ioctl;

	if (video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->dev_nr - 1) < 0) {

		snd_printk(KERN_ERR "unable to register tea575x tuner\n");