[PATCH 7/7] Input: remove pm_dev from core

[Dmitry Torokhov]

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


ChangeSet@xxxxxx, 2004-10-20 00:57:45-05:00, dtor_core@xxxxxxxxxxxxx
  Input: get rid of pm_dev in input core as it is deprecated and
         nothing uses it anyway.
  
  Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>


 drivers/input/input.c                      |    4 ----
 drivers/input/touchscreen/h3600_ts_input.c |    5 +++--
 include/linux/input.h                      |    1 -
 3 files changed, 3 insertions(+), 7 deletions(-)


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



diff -Nru a/drivers/input/input.c b/drivers/input/input.c
--- a/drivers/input/input.c	2004-10-21 02:14:33 -05:00
+++ b/drivers/input/input.c	2004-10-21 02:14:33 -05:00
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/random.h>
 #include <linux/major.h>
-#include <linux/pm.h>
 #include <linux/proc_fs.h>
 #include <linux/kmod.h>
 #include <linux/interrupt.h>
@@ -460,9 +459,6 @@
 	struct list_head * node, * next;
 
 	if (!dev) return;
-
-	if (dev->pm_dev)
-		pm_unregister(dev->pm_dev);
 
 	del_timer_sync(&dev->timer);
 
diff -Nru a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
--- a/drivers/input/touchscreen/h3600_ts_input.c	2004-10-21 02:14:33 -05:00
+++ b/drivers/input/touchscreen/h3600_ts_input.c	2004-10-21 02:14:33 -05:00
@@ -100,6 +100,7 @@
  */
 struct h3600_dev {
 	struct input_dev dev;
+	struct pm_dev *pm_dev;
 	struct serio *serio;
 	unsigned char event;	/* event ID from packet */
 	unsigned char chksum;
@@ -452,8 +453,8 @@
 
 	//h3600_flite_control(1, 25);     /* default brightness */
 #ifdef CONFIG_PM
-	ts->dev.pm_dev = pm_register(PM_ILLUMINATION_DEV, PM_SYS_LIGHT,
-					h3600ts_pm_callback);
+	ts->pm_dev = pm_register(PM_ILLUMINATION_DEV, PM_SYS_LIGHT,
+				h3600ts_pm_callback);
 	printk("registered pm callback\n");
 #endif
 	input_register_device(&ts->dev);
diff -Nru a/include/linux/input.h b/include/linux/input.h
--- a/include/linux/input.h	2004-10-21 02:14:33 -05:00
+++ b/include/linux/input.h	2004-10-21 02:14:33 -05:00
@@ -806,7 +806,6 @@
 	unsigned int repeat_key;
 	struct timer_list timer;
 
-	struct pm_dev *pm_dev;
 	struct pt_regs *regs;
 	int state;
 
-
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/