Skip to content

Commit

Permalink
[media] cx88: don't use atomic_t for core->users
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent f4bd4be commit 8d11593
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions drivers/media/video/cx88/cx88-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/cx88.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 8d11593

Please sign in to comment.