[PATCH 6/7] Input: i8042 remove reboot notifier

[Dmitry Torokhov]

===================================================================


ChangeSet@xxxxxx, 2004-10-20 00:53:53-05:00, dtor_core@xxxxxxxxxxxxx
  Input: i8042 - get rid of reboot notifier as suspend method
         should do the job.
  
  Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>


 i8042.c |   33 +++++----------------------------
 1 files changed, 5 insertions(+), 28 deletions(-)


===================================================================



diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c	2004-10-21 02:14:01 -05:00
+++ b/drivers/input/serio/i8042.c	2004-10-21 02:14:01 -05:00
@@ -16,10 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/config.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
-#include <linux/pm.h>
 #include <linux/serio.h>
 #include <linux/err.h>
 
@@ -825,27 +822,6 @@
 
 
 /*
- * We need to reset the 8042 back to original mode on system shutdown,
- * because otherwise BIOSes will be confused.
- */
-
-static int i8042_notify_sys(struct notifier_block *this, unsigned long code,
-        		    void *unused)
-{
-        if (code == SYS_DOWN || code == SYS_HALT)
-        	i8042_controller_cleanup();
-        return NOTIFY_DONE;
-}
-
-static struct notifier_block i8042_notifier =
-{
-        i8042_notify_sys,
-        NULL,
-        0
-};
-
-
-/*
  * Here we try to restore the original BIOS settings
  */
 
@@ -904,6 +880,11 @@
 
 }
 
+/*
+ * We need to reset the 8042 back to original mode on system shutdown,
+ * because otherwise BIOSes will be confused.
+ */
+
 static void i8042_shutdown(struct device *dev)
 {
 	i8042_controller_cleanup();
@@ -1031,16 +1012,12 @@
 
 	mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
 
-	register_reboot_notifier(&i8042_notifier);
-
 	return 0;
 }
 
 void __exit i8042_exit(void)
 {
 	int i;
-
-	unregister_reboot_notifier(&i8042_notifier);
 
 	i8042_controller_cleanup();
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/