Skip to content

Commit

Permalink
[media] rc-core: fix some leftovers from the renaming patches
Browse files Browse the repository at this point in the history
Fix some minor comments etc which are leftover from the old naming scheme.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
David Härdeman authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 3938e0c commit 829ba9f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/media/rc/ir-raw.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* ir-raw-event.c - handle IR Pulse/Space event
/* ir-raw.c - handle IR pulse/space events
*
* Copyright (C) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
*
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/rc/rc-core-priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* GNU General Public License for more details.
*/

#ifndef _IR_RAW_EVENT
#define _IR_RAW_EVENT
#ifndef _RC_CORE_PRIV
#define _RC_CORE_PRIV

#include <linux/slab.h>
#include <linux/spinlock.h>
Expand Down Expand Up @@ -190,4 +190,4 @@ void ir_raw_init(void);
#endif


#endif /* _IR_RAW_EVENT */
#endif /* _RC_CORE_PRIV */
2 changes: 1 addition & 1 deletion drivers/media/rc/rc-main.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* rc-core.c - handle IR scancode->keycode tables
/* rc-main.c - Remote Controller core module
*
* Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
*
Expand Down
12 changes: 6 additions & 6 deletions include/media/rc-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,12 @@ static inline u32 ir_extract_bits(u32 data, u32 mask)
u32 vbit = 1, value = 0;

do {
if (mask & 1) {
if (data & 1)
value |= vbit;
vbit <<= 1;
}
data >>= 1;
if (mask & 1) {
if (data & 1)
value |= vbit;
vbit <<= 1;
}
data >>= 1;
} while (mask >>= 1);

return value;
Expand Down

0 comments on commit 829ba9f

Please sign in to comment.