more patches removed that made it into 2.6.17-rc1-git12

5 files changed, 0 insertions, 388 deletions

diff --git a/i2c/hwmon-w83792d-quiet-on-misdetection.patch b/i2c/hwmon-w83792d-quiet-on-misdetection.patch
deleted file mode 100644
index 2fd1a9551ad72..0000000000000
--- a/i2c/hwmon-w83792d-quiet-on-misdetection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From khali@linux-fr.org Thu Mar 23 07:37:51 2006
-Date: Thu, 23 Mar 2006 16:38:21 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Subject: [PATCH 05/10] w83792d: Be quiet on misdetection
-Message-Id: <20060323163821.074148b4.khali@linux-fr.org>
-Content-Disposition: inline; filename=hwmon-w83792d-quiet-on-misdetection.patch
-
-Make the w83792d driver keep quiet when misdetecting a chip. This can
-happen, and the user doesn't need to know.
-
-Also renumber the messages, and add one, for consistency.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/hwmon/w83792d.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/hwmon/w83792d.c
-+++ gregkh-2.6/drivers/hwmon/w83792d.c
-@@ -1161,7 +1161,7 @@ w83792d_detect(struct i2c_adapter *adapt
- 	   bank. */
- 	if (kind < 0) {
- 		if (w83792d_read_value(client, W83792D_REG_CONFIG) & 0x80) {
--			dev_warn(dev, "Detection failed at step 3\n");
-+			dev_dbg(dev, "Detection failed at step 1\n");
- 			goto ERROR1;
- 		}
- 		val1 = w83792d_read_value(client, W83792D_REG_BANK);
-@@ -1170,6 +1170,7 @@ w83792d_detect(struct i2c_adapter *adapt
- 		if (!(val1 & 0x07)) {  /* is Bank0 */
- 			if (((!(val1 & 0x80)) && (val2 != 0xa3)) ||
- 			     ((val1 & 0x80) && (val2 != 0x5c))) {
-+				dev_dbg(dev, "Detection failed at step 2\n");
- 				goto ERROR1;
- 			}
- 		}
-@@ -1177,7 +1178,7 @@ w83792d_detect(struct i2c_adapter *adapt
- 		   should match */
- 		if (w83792d_read_value(client,
- 					W83792D_REG_I2C_ADDR) != address) {
--			dev_warn(dev, "Detection failed at step 5\n");
-+			dev_dbg(dev, "Detection failed at step 3\n");
- 			goto ERROR1;
- 		}
- 	}
diff --git a/i2c/i2c-parport-require-type-parameter.patch b/i2c/i2c-parport-require-type-parameter.patch
deleted file mode 100644
index 374ae32d23981..0000000000000
--- a/i2c/i2c-parport-require-type-parameter.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From khali@linux-fr.org Thu Mar 23 07:49:59 2006
-Date: Thu, 23 Mar 2006 16:50:25 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
-Subject: [PATCH 10/10] i2c-parport: Make type parameter mandatory
-Message-Id: <20060323165025.ddb0f7c7.khali@linux-fr.org>
-Content-Disposition: inline; filename=i2c-parport-require-type-parameter.patch
-
-From: "Mark M. Hoffman" <mhoffman@lightlink.com>
-
-This patch forces the user to specify what type of adapter is present when
-loading i2c-parport or i2c-parport-light.  If none is specified, the driver
-init simply fails - instead of assuming adapter type 0.
-
-This alleviates the sometimes lengthy boot time delays which can be caused
-by accidentally building one of these into a kernel along with several i2c
-slave drivers that have lengthy probe routines (e.g. hwmon drivers).
-
-Kconfig and documentation updated accordingly.
-
-Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- Documentation/i2c/busses/i2c-parport   |   16 ++++++++++------
- drivers/i2c/busses/Kconfig             |    5 ++++-
- drivers/i2c/busses/i2c-parport-light.c |    9 +++++++--
- drivers/i2c/busses/i2c-parport.c       |    9 +++++++--
- drivers/i2c/busses/i2c-parport.h       |    2 +-
- 5 files changed, 29 insertions(+), 12 deletions(-)
-
---- gregkh-2.6.orig/Documentation/i2c/busses/i2c-parport
-+++ gregkh-2.6/Documentation/i2c/busses/i2c-parport
-@@ -12,18 +12,22 @@ meant as a replacement for the older, in
-                       teletext adapters)
- 
- It currently supports the following devices:
-- * Philips adapter
-- * home brew teletext adapter
-- * Velleman K8000 adapter
-- * ELV adapter
-- * Analog Devices evaluation boards (ADM1025, ADM1030, ADM1031, ADM1032)
-- * Barco LPT->DVI (K5800236) adapter
-+ * (type=0) Philips adapter
-+ * (type=1) home brew teletext adapter
-+ * (type=2) Velleman K8000 adapter
-+ * (type=3) ELV adapter
-+ * (type=4) Analog Devices ADM1032 evaluation board
-+ * (type=5) Analog Devices evaluation boards: ADM1025, ADM1030, ADM1031
-+ * (type=6) Barco LPT->DVI (K5800236) adapter
- 
- These devices use different pinout configurations, so you have to tell
- the driver what you have, using the type module parameter. There is no
- way to autodetect the devices. Support for different pinout configurations
- can be easily added when needed.
- 
-+Earlier kernels defaulted to type=0 (Philips).  But now, if the type
-+parameter is missing, the driver will simply fail to initialize.
-+
- 
- Building your own adapter
- -------------------------
---- gregkh-2.6.orig/drivers/i2c/busses/Kconfig
-+++ gregkh-2.6/drivers/i2c/busses/Kconfig
-@@ -286,7 +286,10 @@ config I2C_PARPORT
- 	  This driver is a replacement for (and was inspired by) an older
- 	  driver named i2c-philips-par.  The new driver supports more devices,
- 	  and makes it easier to add support for new devices.
--	  
-+
-+	  An adapter type parameter is now mandatory.  Please read the file
-+	  Documentation/i2c/busses/i2c-parport for details.
-+
- 	  Another driver exists, named i2c-parport-light, which doesn't depend
- 	  on the parport driver.  This is meant for embedded systems. Don't say
- 	  Y here if you intend to say Y or M there.
---- gregkh-2.6.orig/drivers/i2c/busses/i2c-parport-light.c
-+++ gregkh-2.6/drivers/i2c/busses/i2c-parport-light.c
-@@ -121,9 +121,14 @@ static struct i2c_adapter parport_adapte
- 
- static int __init i2c_parport_init(void)
- {
--	if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
-+	if (type < 0) {
-+		printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
-+		return -ENODEV;
-+	}
-+
-+	if (type >= ARRAY_SIZE(adapter_parm)) {
- 		printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
--		type = 0;
-+		return -ENODEV;
- 	}
- 
- 	if (base == 0) {
---- gregkh-2.6.orig/drivers/i2c/busses/i2c-parport.c
-+++ gregkh-2.6/drivers/i2c/busses/i2c-parport.c
-@@ -241,9 +241,14 @@ static struct parport_driver i2c_parport
- 
- static int __init i2c_parport_init(void)
- {
--	if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
-+	if (type < 0) {
-+		printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
-+		return -ENODEV;
-+	}
-+
-+	if (type >= ARRAY_SIZE(adapter_parm)) {
- 		printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
--		type = 0;
-+		return -ENODEV;
- 	}
- 
- 	return parport_register_driver(&i2c_parport_driver);
---- gregkh-2.6.orig/drivers/i2c/busses/i2c-parport.h
-+++ gregkh-2.6/drivers/i2c/busses/i2c-parport.h
-@@ -90,7 +90,7 @@ static struct adapter_parm adapter_parm[
- 	},
- };
- 
--static int type;
-+static int type = -1;
- module_param(type, int, 0);
- MODULE_PARM_DESC(type,
- 	"Type of adapter:\n"
diff --git a/i2c/i2c-sis96x-remove-init-log-message.patch b/i2c/i2c-sis96x-remove-init-log-message.patch
deleted file mode 100644
index bab2d8e937871..0000000000000
--- a/i2c/i2c-sis96x-remove-init-log-message.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From khali@linux-fr.org Thu Mar 23 07:49:02 2006
-Date: Thu, 23 Mar 2006 16:49:34 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
-Subject: [PATCH 09/10] i2c-sis96x: Remove an init-time log message
-Message-Id: <20060323164934.5bc2122f.khali@linux-fr.org>
-Content-Disposition: inline; filename=i2c-sis96x-remove-init-log-message.patch
-
-From: "Mark M. Hoffman" <mhoffman@lightlink.com>
-
-This patch removes an init-time kernel log message.
-http://marc.theaimsgroup.com/?l=linux-kernel&m=114232987208628&w=3
-
-Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/i2c/busses/i2c-sis96x.c |    8 --------
- 1 file changed, 8 deletions(-)
-
---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis96x.c
-+++ gregkh-2.6/drivers/i2c/busses/i2c-sis96x.c
-@@ -43,13 +43,6 @@
- #include <linux/init.h>
- #include <asm/io.h>
- 
--/*
--	HISTORY:
--	2003-05-11	1.0.0 	Updated from lm_sensors project for kernel 2.5
--				(was i2c-sis645.c from lm_sensors 2.7.0)
--*/
--#define SIS96x_VERSION "1.0.0"
--
- /* base address register in PCI config space */
- #define SIS96x_BAR 0x04
- 
-@@ -337,7 +330,6 @@ static struct pci_driver sis96x_driver =
- 
- static int __init i2c_sis96x_init(void)
- {
--	printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
- 	return pci_register_driver(&sis96x_driver);
- }
- 
diff --git a/i2c/rtc-ds1374-convert-tasklet-to-workqueue.patch b/i2c/rtc-ds1374-convert-tasklet-to-workqueue.patch
deleted file mode 100644
index 7af32236b427d..0000000000000
--- a/i2c/rtc-ds1374-convert-tasklet-to-workqueue.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From khali@linux-fr.org Fri Mar 31 13:04:57 2006
-Date: Fri, 31 Mar 2006 23:05:01 +0200
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Subject: [PATCH 1/3] i2c: convert ds1374 to use a workqueue
-Message-Id: <20060331230501.c9858518.khali@linux-fr.org>
-Content-Disposition: inline; filename=rtc-ds1374-convert-tasklet-to-workqueue.patch
-
-A tasklet is not suitable for what the ds1374 driver does: neither sleeping
-nor mutex operations are allowed in tasklets, and ds1374_set_tlet may do
-both.
-
-We can use a workqueue instead, where both sleeping and mutex operations
-are allowed.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Acked-by: Randy Vinson <rvinson@mvista.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/i2c/chips/ds1374.c |   16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
---- gregkh-2.6.orig/drivers/i2c/chips/ds1374.c
-+++ gregkh-2.6/drivers/i2c/chips/ds1374.c
-@@ -27,6 +27,7 @@
- #include <linux/rtc.h>
- #include <linux/bcd.h>
- #include <linux/mutex.h>
-+#include <linux/workqueue.h>
- 
- #define DS1374_REG_TOD0		0x00
- #define DS1374_REG_TOD1		0x01
-@@ -139,7 +140,7 @@ ulong ds1374_get_rtc_time(void)
- 	return t1;
- }
- 
--static void ds1374_set_tlet(ulong arg)
-+static void ds1374_set_work(void *arg)
- {
- 	ulong t1, t2;
- 	int limit = 10;		/* arbitrary retry limit */
-@@ -168,17 +169,18 @@ static void ds1374_set_tlet(ulong arg)
- 
- static ulong new_time;
- 
--static DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet,
--				(ulong) & new_time);
-+static struct workqueue_struct *ds1374_workqueue;
-+
-+static DECLARE_WORK(ds1374_work, ds1374_set_work, &new_time);
- 
- int ds1374_set_rtc_time(ulong nowtime)
- {
- 	new_time = nowtime;
- 
- 	if (in_interrupt())
--		tasklet_schedule(&ds1374_tasklet);
-+		queue_work(ds1374_workqueue, &ds1374_work);
- 	else
--		ds1374_set_tlet((ulong) & new_time);
-+		ds1374_set_work(&new_time);
- 
- 	return 0;
- }
-@@ -204,6 +206,8 @@ static int ds1374_probe(struct i2c_adapt
- 	client->adapter = adap;
- 	client->driver = &ds1374_driver;
- 
-+	ds1374_workqueue = create_singlethread_workqueue("ds1374");
-+
- 	if ((rc = i2c_attach_client(client)) != 0) {
- 		kfree(client);
- 		return rc;
-@@ -227,7 +231,7 @@ static int ds1374_detach(struct i2c_clie
- 
- 	if ((rc = i2c_detach_client(client)) == 0) {
- 		kfree(i2c_get_clientdata(client));
--		tasklet_kill(&ds1374_tasklet);
-+		destroy_workqueue(ds1374_workqueue);
- 	}
- 	return rc;
- }
diff --git a/i2c/rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch b/i2c/rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch
deleted file mode 100644
index 1ff11eedc31de..0000000000000
--- a/i2c/rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From khali@linux-fr.org Fri Mar 31 13:05:53 2006
-Date: Fri, 31 Mar 2006 23:06:03 +0200
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: "Mark A. Greer" <mgreer@mvista.com>
-Subject: [PATCH 2/3] i2c: convert m41t00 to use a workqueue
-Message-Id: <20060331230603.4a8bc540.khali@linux-fr.org>
-Content-Disposition: inline; filename=rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch
-
-From: "Mark A. Greer" <mgreer@mvista.com>
-
-The m41t00 i2c/rtc driver currently uses a tasklet to schedule
-interrupt-level writes to the rtc.  This patch causes the driver
-to use a workqueue instead.
-
-Signed-off-by: Mark A. Greer <mgreer@mvista.com>
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/i2c/chips/m41t00.c |   16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
---- gregkh-2.6.orig/drivers/i2c/chips/m41t00.c
-+++ gregkh-2.6/drivers/i2c/chips/m41t00.c
-@@ -25,6 +25,7 @@
- #include <linux/rtc.h>
- #include <linux/bcd.h>
- #include <linux/mutex.h>
-+#include <linux/workqueue.h>
- 
- #include <asm/time.h>
- #include <asm/rtc.h>
-@@ -111,7 +112,7 @@ m41t00_get_rtc_time(void)
- }
- 
- static void
--m41t00_set_tlet(ulong arg)
-+m41t00_set(void *arg)
- {
- 	struct rtc_time	tm;
- 	ulong	nowtime = *(ulong *)arg;
-@@ -145,9 +146,9 @@ m41t00_set_tlet(ulong arg)
- 	return;
- }
- 
--static ulong	new_time;
--
--DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
-+static ulong new_time;
-+static struct workqueue_struct *m41t00_wq;
-+static DECLARE_WORK(m41t00_work, m41t00_set, &new_time);
- 
- int
- m41t00_set_rtc_time(ulong nowtime)
-@@ -155,9 +156,9 @@ m41t00_set_rtc_time(ulong nowtime)
- 	new_time = nowtime;
- 
- 	if (in_interrupt())
--		tasklet_schedule(&m41t00_tasklet);
-+		queue_work(m41t00_wq, &m41t00_work);
- 	else
--		m41t00_set_tlet((ulong)&new_time);
-+		m41t00_set(&new_time);
- 
- 	return 0;
- }
-@@ -189,6 +190,7 @@ m41t00_probe(struct i2c_adapter *adap, i
- 		return rc;
- 	}
- 
-+	m41t00_wq = create_singlethread_workqueue("m41t00");
- 	save_client = client;
- 	return 0;
- }
-@@ -206,7 +208,7 @@ m41t00_detach(struct i2c_client *client)
- 
- 	if ((rc = i2c_detach_client(client)) == 0) {
- 		kfree(client);
--		tasklet_kill(&m41t00_tasklet);
-+		destroy_workqueue(m41t00_wq);
- 	}
- 	return rc;
- }