[Linuxconsole-commit]CVS: ruby/linux/drivers/input evdev.c,1.40,1.41 hiddev.c,1.7,1.8 input.c,1.47,1.48 joydev.c,1.36,1.37 mousedev.c,1.37,1.38 ns558.c,1.40,1.41 tsdev.c,1.9,1.10

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv21051/drivers/input

Modified Files:
	evdev.c hiddev.c input.c joydev.c mousedev.c ns558.c tsdev.c 
Log Message:
Synced to 2.5.1. The USB stuff has changed thus breaking the HID stuff.

Index: evdev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/evdev.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- evdev.c	2001/10/17 10:38:13	1.40
+++ evdev.c	2001/12/26 21:08:33	1.41
@@ -99,7 +99,6 @@
 	struct evdev_list *list = file->private_data;
 	struct evdev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->evdev->list;
 	evdev_fasync(-1, file, 0);
 
@@ -118,8 +117,7 @@
 	}
 
 	kfree(list);
-	unlock_kernel();
-
+	
 	return 0;
 }
 

Index: hiddev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/hiddev.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hiddev.c	2001/10/17 17:00:13	1.7
+++ hiddev.c	2001/12/26 21:08:33	1.8
@@ -193,7 +193,6 @@
 	struct hiddev_list *list = file->private_data;
 	struct hiddev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->hiddev->list;
 	hiddev_fasync(-1, file, 0);
 
@@ -209,7 +208,6 @@
 	}
 
 	kfree(list);
-	unlock_kernel();
 
 	return 0;
 }

Index: input.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/input.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- input.c	2001/10/06 14:46:03	1.47
+++ input.c	2001/12/26 21:08:33	1.48
@@ -637,9 +637,7 @@
 	old_fops = file->f_op;
 	file->f_op = new_fops;
 
-	lock_kernel();
 	err = new_fops->open(inode, file);
-	unlock_kernel();
 
 	if (err) {
 		fops_put(file->f_op);

Index: joydev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joydev.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- joydev.c	2001/12/18 07:53:07	1.36
+++ joydev.c	2001/12/26 21:08:33	1.37
@@ -166,7 +166,6 @@
 	struct joydev_list *list = file->private_data;
 	struct joydev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->joydev->list;
 	joydev_fasync(-1, file, 0);
 
@@ -185,7 +184,6 @@
 	}
 
 	kfree(list);
-	unlock_kernel();
 
 	return 0;
 }

Index: mousedev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mousedev.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- mousedev.c	2001/10/17 10:38:13	1.37
+++ mousedev.c	2001/12/26 21:08:33	1.38
@@ -181,7 +181,6 @@
 	struct mousedev_list *list = file->private_data;
 	struct mousedev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->mousedev->list;
 	mousedev_fasync(-1, file, 0);
 
@@ -219,7 +218,6 @@
 	}
 	
 	kfree(list);
-	unlock_kernel();
 
 	return 0;
 }

Index: ns558.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/ns558.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ns558.c	2001/11/13 22:48:01	1.40
+++ ns558.c	2001/12/26 21:08:33	1.41
@@ -163,11 +163,7 @@
 	return port;
 }
 
-#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
-#define NSS558_ISAPNP
-#endif
-
-#ifdef NSS558_ISAPNP
+#ifdef __ISAPNP__
 
 #define NS558_DEVICE(a,b,c,d)\
 	card_vendor: ISAPNP_ANY_ID, card_device: ISAPNP_ANY_ID,\
@@ -266,7 +262,7 @@
 int __init ns558_init(void)
 {
 	int i = 0;
-#ifdef NSS558_ISAPNP
+#ifdef __ISAPNP__
 	struct isapnp_device_id *devid;
 	struct pci_dev *dev = NULL;
 #endif
@@ -282,7 +278,7 @@
  * Probe for PnP ports.
  */
 
-#ifdef NSS558_ISAPNP
+#ifdef __ISAPNP__
 	for (devid = pnp_devids; devid->vendor; devid++) {
 		while ((dev = isapnp_find_dev(NULL, devid->vendor, devid->function, dev))) {
 			ns558 = ns558_pnp_probe(dev, ns558);
@@ -301,7 +297,7 @@
 		gameport_unregister_port(&port->gameport);
 		switch (port->type) {
 
-#ifdef NSS558_ISAPNP
+#ifdef __ISAPNP__
 			case NS558_PNP:
 				if (port->dev->deactivate)
 					port->dev->deactivate(port->dev);

Index: tsdev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/tsdev.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tsdev.c	2001/10/17 17:00:14	1.9
+++ tsdev.c	2001/12/26 21:08:33	1.10
@@ -120,7 +120,6 @@
 	struct tsdev_list *list = file->private_data;
 	struct tsdev_list **listptr;
 
-	lock_kernel();
 	listptr = &list->tsdev->list;
 	tsdev_fasync(-1, file, 0);
 
@@ -138,7 +137,6 @@
 		}
 	}
 	kfree(list);
-	unlock_kernel();
 	return 0;
 }