Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / drivers / char / i8k.c

diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index f3c3aaf4560e86d07161fb2b8255882c9bf74599..30e564516422edd31d42996d520c2fdb6bb7206b 100644 (file)
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -22,6 +22,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -80,7 +81,7 @@ static int i8k_open_fs(struct inode *inode, struct file *file);
 static int i8k_ioctl(struct inode *, struct file *, unsigned int,
                     unsigned long);
 
-static struct file_operations i8k_fops = {
+static const struct file_operations i8k_fops = {
        .open           = i8k_open_fs,
        .read           = seq_read,
        .llseek         = seq_lseek,
@@ -97,9 +98,9 @@ struct smm_regs {
        unsigned int edi __attribute__ ((packed));
 };
 
-static inline char *i8k_get_dmi_data(int field)
+static inline const char *i8k_get_dmi_data(int field)
 {
-       char *dmi_data = dmi_get_system_info(field);
+       const char *dmi_data = dmi_get_system_info(field);
 
        return dmi_data && *dmi_data ? dmi_data : "?";
 }
@@ -370,14 +371,14 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
        int fn_key, cpu_temp, ac_power;
        int left_fan, right_fan, left_speed, right_speed;
 
-       cpu_temp        = i8k_get_temp(0);                      /* 11100 µs */
-       left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 µs */
-       right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 µs */
-       left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 µs */
-       right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 µs */
-       fn_key          = i8k_get_fn_status();                  /*   750 µs */
+       cpu_temp        = i8k_get_temp(0);                      /* 11100 µs */
+       left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 µs */
+       right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 µs */
+       left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 µs */
+       right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 µs */
+       fn_key          = i8k_get_fn_status();                  /*   750 µs */
        if (power_status)
-               ac_power = i8k_get_power_status();              /* 14700 µs */
+               ac_power = i8k_get_power_status();              /* 14700 µs */
        else
                ac_power = -1;