Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

[mv-sheeva.git] / drivers / media / radio / miropcm20-rds.c

diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index e09214082e011ef974bdd09297786e3839eef424..06dfed9ef4c7194d043999d23ed7eda35e9025c4 100644 (file)
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -14,13 +14,12 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
-#include <linux/sched.h>       /* current, TASK_*, schedule_timeout() */
 #include <linux/delay.h>
 #include <asm/uaccess.h>
 #include "miropcm20-rds-core.h"
 
 static char * text_buffer;
-static int rds_users = 0;
+static int rds_users;
 
 
 static int rds_f_open(struct inode *in, struct file *fi)
@@ -48,7 +47,7 @@ static int rds_f_release(struct inode *in, struct file *fi)
 
 static void print_matrix(char *ch, char out[])
 {
-        int j;
+       int j;
 
        for (j=7; j>=0; j--) {
                 out[7-j] = ((*ch >> j) & 0x1) + '0';
@@ -105,7 +104,7 @@ static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length,
        }
 }
 
-static struct file_operations rds_fops = {
+static const struct file_operations rds_fops = {
        .owner          = THIS_MODULE,
        .read           = rds_f_read,
        .open           = rds_f_open,
@@ -115,7 +114,6 @@ static struct file_operations rds_fops = {
 static struct miscdevice rds_miscdev = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = "radiotext",
-       .devfs_name     = "v4l/rds/radiotext",
        .fops           = &rds_fops,
 };