[media] cx88: don't use atomic_t for core->users
users is always read or written with core->lock held. A plain int is simpler and faster. Tested-by: Andi Huber <hobrom@gmx.at> Tested-by: Marlon de Boer <marlon@hyves.nl> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
f4bd4be8d1
commit
8d11593162
|
@ -824,7 +824,7 @@ static int video_open(struct file *file)
|
|||
call_all(core, tuner, s_radio);
|
||||
}
|
||||
|
||||
atomic_inc(&core->users);
|
||||
core->users++;
|
||||
mutex_unlock(&core->lock);
|
||||
|
||||
return 0;
|
||||
|
@ -922,7 +922,8 @@ static int video_release(struct file *file)
|
|||
file->private_data = NULL;
|
||||
kfree(fh);
|
||||
|
||||
if(atomic_dec_and_test(&dev->core->users))
|
||||
dev->core->users--;
|
||||
if (!dev->core->users)
|
||||
call_all(dev->core, core, s_power, 0);
|
||||
mutex_unlock(&dev->core->lock);
|
||||
|
||||
|
|
|
@ -389,7 +389,7 @@ struct cx88_core {
|
|||
struct mutex lock;
|
||||
/* various v4l controls */
|
||||
u32 freq;
|
||||
atomic_t users;
|
||||
int users;
|
||||
int mpeg_users;
|
||||
|
||||
/* cx88-video needs to access cx8802 for hybrid tuner pll access. */
|
||||
|
|
Loading…
Reference in a new issue