[PATCH] i8k driver cleanups

  The input system in 2.5 is able to see the volume keys on inspiron
  notebooks w/o help from i8k.c.  This patch therefore removes the
  new code from i8kutils-1.17 for feeding those keypresses to the
  keyboard driver.

  This leaves only MODULE_PARM(restricted, "i") as the useful addition
  to what was in 2.5.58's i8k.c.  This module parm restricts control of
  the system fans to processes with CAP_SYS_ADMIN set.

diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 9b8e1bf0391781ca59b2556c7fcd42565db29512..3ecb6223d9325db206b1d2d996c61d97545e0284 100644 (file)
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -22,8 +22,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/apm_bios.h>
-#include <linux/kbd_kern.h>
-#include <linux/timer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -57,19 +55,6 @@
 
 #define DELL_SIGNATURE         "Dell Computer"
 
-/* Interval between polling of keys, in jiffies. */
-#define I8K_POLL_INTERVAL      (HZ/20)
-#define I8K_REPEAT_DELAY       250     /* 250 ms */
-#define I8K_REPEAT_RATE                10
-
-/*
- * (To be escaped) Scancodes for the keys.  These were chosen to match other
- * "Internet" keyboards.
- */
-#define I8K_KEYS_UP_SCANCODE   0x30
-#define I8K_KEYS_DOWN_SCANCODE 0x2e
-#define I8K_KEYS_MUTE_SCANCODE 0x20
-
 static char *supported_models[] = {
     "Inspiron",
     "Latitude",
@@ -83,33 +68,21 @@ static char serial_number[16] = "?";
 
 static int force = 0;
 static int restricted = 0;
-static int handle_buttons = 0;
-static int repeat_delay = I8K_REPEAT_DELAY;
-static int repeat_rate = I8K_REPEAT_RATE;
 static int power_status = 0;
 
-static struct timer_list  i8k_keys_timer;
-
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
 MODULE_LICENSE("GPL");
 MODULE_PARM(force, "i");
 MODULE_PARM(restricted, "i");
-MODULE_PARM(handle_buttons, "i");
-MODULE_PARM(repeat_delay, "i");
-MODULE_PARM(repeat_rate, "i");
 MODULE_PARM(power_status, "i");
 MODULE_PARM_DESC(force, "Force loading without checking for supported models");
 MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
-MODULE_PARM_DESC(handle_buttons, "Generate keyboard events for i8k buttons");
-MODULE_PARM_DESC(repeat_delay, "I8k buttons repeat delay (ms)");
-MODULE_PARM_DESC(repeat_rate, "I8k buttons repeat rate");
 MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");
 
 static ssize_t i8k_read(struct file *, char *, size_t, loff_t *);
 static int i8k_ioctl(struct inode *, struct file *, unsigned int,
                     unsigned long);
-static void i8k_keys_set_timer(void);
 
 static struct file_operations i8k_fops = {
     .read      = i8k_read,
@@ -516,61 +489,6 @@ static ssize_t i8k_read(struct file *f, char *buffer, size_t len, loff_t *fpos)
     return len;
 }
 
-/*
- * i8k_keys stuff. Thanks to David Bustos <bustos@caltech.edu>
- */
-
-static unsigned char i8k_keys_make_scancode(int x) {
-    switch (x) {
-    case I8K_FN_UP:    return I8K_KEYS_UP_SCANCODE;
-    case I8K_FN_DOWN:  return I8K_KEYS_DOWN_SCANCODE;
-    case I8K_FN_MUTE:  return I8K_KEYS_MUTE_SCANCODE;
-    }
-
-    return 0;
-}
-
-static void i8k_keys_poll(unsigned long data) {
-    static int last = 0;
-    static int repeat = 0;
-
-    int  curr;
-
-    curr = i8k_get_fn_status();
-    if (curr >= 0) {
-       if (curr != last) {
-           repeat = jiffies + (HZ * repeat_delay / 1000);
-
-           if (last != 0) {
-               handle_scancode(0xe0, 0);
-               handle_scancode(i8k_keys_make_scancode(last), 0);
-           }
-
-           if (curr != 0) {
-               handle_scancode(0xe0, 1);
-               handle_scancode(i8k_keys_make_scancode(curr), 1);
-           }
-       } else {
-           /* Generate keyboard repeat events with current scancode -- dz */
-           if ((curr) && (repeat_rate > 0) && (jiffies >= repeat)) {
-               repeat = jiffies + (HZ / repeat_rate);
-               handle_scancode(0xe0, 1);
-               handle_scancode(i8k_keys_make_scancode(curr), 1);
-           }
-       }
-
-       last = curr;
-    }
-
-    /* Reset the timer. */
-    i8k_keys_set_timer();
-}
-
-static void i8k_keys_set_timer() {
-    i8k_keys_timer.expires = jiffies + I8K_POLL_INTERVAL;
-    add_timer(&i8k_keys_timer);
-}
-
 static char* __init string_trim(char *s, int size)
 {
     int len;
@@ -845,16 +763,6 @@ int __init i8k_init(void)
           "Dell laptop SMM driver v%s Massimo Dal Zotto (dz@debian.org)\n",
           I8K_VERSION);
 
-    /* Register the i8k_keys timer. */
-    if (handle_buttons) {
-       printk(KERN_INFO
-              "i8k: enabling buttons events, delay=%d, rate=%d\n",
-              repeat_delay, repeat_rate);
-       init_timer(&i8k_keys_timer);
-       i8k_keys_timer.function = i8k_keys_poll;
-       i8k_keys_set_timer();
-    }
-
     return 0;
 }
 
@@ -869,11 +777,6 @@ void cleanup_module(void)
     /* Remove the proc entry */
     remove_proc_entry("i8k", NULL);
 
-    /* Unregister the i8k_keys timer. */
-    while (handle_buttons && !del_timer(&i8k_keys_timer)) {
-       schedule_timeout(I8K_POLL_INTERVAL);
-    }
-
     printk(KERN_INFO "i8k: module unloaded\n");
 }
 #endif