Browse Source

[media] rc-core: fix some leftovers from the renaming patches

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>
David Härdeman 14 years ago
parent
commit
829ba9fe34

+ 1 - 1
drivers/media/rc/ir-raw.c

@@ -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>
  * Copyright (C) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  *

+ 3 - 3
drivers/media/rc/rc-core-priv.h

@@ -13,8 +13,8 @@
  *  GNU General Public License for more details.
  *  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/slab.h>
 #include <linux/spinlock.h>
 #include <linux/spinlock.h>
@@ -190,4 +190,4 @@ void ir_raw_init(void);
 #endif
 #endif
 
 
 
 
-#endif /* _IR_RAW_EVENT */
+#endif /* _RC_CORE_PRIV */

+ 1 - 1
drivers/media/rc/rc-main.c

@@ -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>
  * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *
  *

+ 6 - 6
include/media/rc-core.h

@@ -206,12 +206,12 @@ static inline u32 ir_extract_bits(u32 data, u32 mask)
 	u32 vbit = 1, value = 0;
 	u32 vbit = 1, value = 0;
 
 
 	do {
 	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);
 	} while (mask >>= 1);
 
 
 	return value;
 	return value;