Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / ttpci / av7110_ir.c

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 6322800ee12b9bef96519113c912af47e32d8105..23a1c6380d3f22964ef98ead022c3b3442901536 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -25,10 +25,9 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "av7110.h"
 #include "av7110_hw.h"
@@ -134,7 +133,7 @@ static void av7110_emit_key(unsigned long parm)
                break;
 
        default:
-               printk("%s invalid protocol %x\n", __FUNCTION__, ir->protocol);
+               printk("%s invalid protocol %x\n", __func__, ir->protocol);
                return;
        }
 
@@ -144,7 +143,7 @@ static void av7110_emit_key(unsigned long parm)
        keycode = ir->key_map[data];
 
        dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n",
-               __FUNCTION__, ircom, addr, data, keycode);
+               __func__, ircom, addr, data, keycode);
 
        /* check device address */
        if (!(ir->device_mask & (1 << addr)))
@@ -152,7 +151,7 @@ static void av7110_emit_key(unsigned long parm)
 
        if (!keycode) {
                printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n",
-                       __FUNCTION__, ircom, addr, data);
+                       __func__, ircom, addr, data);
                return;
        }
 
@@ -280,7 +279,7 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer,
        if (count < size)
                return -EINVAL;
 
-       page = (char *) vmalloc(size);
+       page = vmalloc(size);
        if (!page)
                return -ENOMEM;