lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (11954): dsbr100: remove radio->users counter

Browse Source 
Patch removes radio->users counter because it is not in use.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Alexey Klimov
2009-06-11 00:17:06 -03:00
committed by Mauro Carvalho Chehab
parent 92051b285b
commit 6f094eb9a8
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/radio/dsbr100.c
View File

@@ -145,7 +145,6 @@ struct dsbr100_device {
struct mutex lock; /* buffer locking */ struct mutex lock; /* buffer locking */
int curfreq; int curfreq;
int stereo; int stereo;
int users;
int removed; int removed;
int muted; int muted;
}; };
@@ -549,14 +548,12 @@ static int usb_dsbr100_open(struct file *file)
int retval; int retval;
lock_kernel(); lock_kernel();
radio->users = 1;
radio->muted = 1; radio->muted = 1;
retval = dsbr100_start(radio); retval = dsbr100_start(radio);
if (retval < 0) { if (retval < 0) {
dev_warn(&radio->usbdev->dev, dev_warn(&radio->usbdev->dev,
"Radio did not start up properly\n"); "Radio did not start up properly\n");
radio->users = 0;
unlock_kernel(); unlock_kernel();
return -EIO; return -EIO;
} }
@@ -578,10 +575,6 @@ static int usb_dsbr100_close(struct file *file)
if (!radio) if (!radio)
return -ENODEV; return -ENODEV;
mutex_lock(&radio->lock);
radio->users = 0;
mutex_unlock(&radio->lock);
if (!radio->removed) { if (!radio->removed) {
retval = dsbr100_stop(radio); retval = dsbr100_stop(radio);
if (retval < 0) { if (retval < 0) {
@@ -695,7 +688,6 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
mutex_init(&radio->lock); mutex_init(&radio->lock);
radio->removed = 0; radio->removed = 0;
radio->users = 0;
radio->usbdev = interface_to_usbdev(intf); radio->usbdev = interface_to_usbdev(intf);
radio->curfreq = FREQ_MIN * FREQ_MUL; radio->curfreq = FREQ_MIN * FREQ_MUL;