remove i2c patches that made it into mainline

4 files changed, 0 insertions, 247 deletions

diff --git a/i2c/hwmon-w83627hf-bugfixes.patch b/i2c/hwmon-w83627hf-bugfixes.patch
deleted file mode 100644
index 4c0f4317d9e1e..0000000000000
--- a/i2c/hwmon-w83627hf-bugfixes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From khali@linux-fr.org Mon Nov  7 13:19:11 2005
-Date: Mon, 7 Nov 2005 22:19:04 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: Yuan Mu <Ymu@winbond.com.tw>
-Subject: [PATCH] hwmon: Fix two w83627hf bugs
-Message-Id: <20051107221904.1744d07d.khali@linux-fr.org>
-Content-Disposition: inline; filename=hwmon-w83627hf-bugfixes.patch
-
-From: Yuan Mu <Ymu@winbond.com.tw>
-
-* Fix in4 reads for W83627THF and W83637HF chips.
-* Use the correct register for alarm flags.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/hwmon/w83627hf.c |   16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
---- gregkh-2.6.orig/drivers/hwmon/w83627hf.c
-+++ gregkh-2.6/drivers/hwmon/w83627hf.c
-@@ -180,11 +180,10 @@ superio_exit(void)
- #define W83781D_REG_BANK 0x4E
- 
- #define W83781D_REG_CONFIG 0x40
--#define W83781D_REG_ALARM1 0x41
--#define W83781D_REG_ALARM2 0x42
--#define W83781D_REG_ALARM3 0x450
-+#define W83781D_REG_ALARM1 0x459
-+#define W83781D_REG_ALARM2 0x45A
-+#define W83781D_REG_ALARM3 0x45B
- 
--#define W83781D_REG_IRQ 0x4C
- #define W83781D_REG_BEEP_CONFIG 0x4D
- #define W83781D_REG_BEEP_INTS1 0x56
- #define W83781D_REG_BEEP_INTS2 0x57
-@@ -1370,13 +1369,6 @@ static void w83627hf_init_client(struct 
- 					W83781D_REG_TEMP3_CONFIG, tmp & 0xfe);
- 			}
- 		}
--
--		/* enable comparator mode for temp2 and temp3 so
--	           alarm indication will work correctly */
--		i = w83627hf_read_value(client, W83781D_REG_IRQ);
--		if (!(i & 0x40))
--			w83627hf_write_value(client, W83781D_REG_IRQ,
--					    i | 0x40);
- 	}
- 
- 	/* Start monitoring */
-@@ -1400,7 +1392,7 @@ static struct w83627hf_data *w83627hf_up
- 			/* skip missing sensors */
- 			if (((data->type == w83697hf) && (i == 1)) ||
- 			    ((data->type == w83627thf || data->type == w83637hf)
--			    && (i == 4 || i == 5)))
-+			    && (i == 5 || i == 6)))
- 				continue;
- 			data->in[i] =
- 			    w83627hf_read_value(client, W83781D_REG_IN(i));
diff --git a/i2c/i2c-doc-writing-clients-fix-2.patch b/i2c/i2c-doc-writing-clients-fix-2.patch
deleted file mode 100644
index 0aaa50bb5951a..0000000000000
--- a/i2c/i2c-doc-writing-clients-fix-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From khali@linux-fr.org Wed Nov  2 15:35:52 2005
-Date: Wed, 2 Nov 2005 21:42:48 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Subject: i2c: writing-client doc update complement
-Message-Id: <20051102214248.29ef2124.khali@linux-fr.org>
-Content-Disposition: inline; filename=i2c-doc-writing-clients-fix-2.patch
-
-My latest update to the writing-clients i2c documentation file was
-incomplete, here's the complement.
-
-Large parts of this file are still way out-of-date, but at least now
-the memory allocation and freeing instructions are consistent.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- Documentation/i2c/writing-clients |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/Documentation/i2c/writing-clients
-+++ gregkh-2.6/Documentation/i2c/writing-clients
-@@ -412,7 +412,7 @@ For now, you can ignore the `flags' para
-         release_region(address,FOO_EXTENT);
-     /* SENSORS ONLY END */
-     ERROR1:
--      kfree(new_client);
-+      kfree(data);
-     ERROR0:
-       return err;
-   }
-@@ -443,7 +443,7 @@ much simpler than the attachment code, f
-       release_region(client->addr,LM78_EXTENT);
-     /* HYBRID SENSORS CHIP ONLY END */
- 
--    kfree(data);
-+    kfree(i2c_get_clientdata(client));
-     return 0;
-   }
- 
diff --git a/i2c/i2c-ds1337-bcd.patch b/i2c/i2c-ds1337-bcd.patch
deleted file mode 100644
index b78aef3a7931f..0000000000000
--- a/i2c/i2c-ds1337-bcd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From khali@linux-fr.org Sun Nov  6 14:11:57 2005
-Date: Sun, 6 Nov 2005 23:07:38 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: James Chapman <jchapman@katalix.com>, Michael Burian <dynmail1@gassner-waagen.at>
-Subject: [PATCH] i2c: ds1337 BCD conversion fix
-Message-Id: <20051106230738.261fbaa2.khali@linux-fr.org>
-Content-Disposition: inline; filename=i2c-ds1337-bcd.patch
-
-From: James Chapman <jchapman@katalix.com>
-
-Fix BCD value errors when month=9, moving the increment inside the
-BIN2BCD macro.
-Fix similar code for the weekday value, just for consistency.
-
-This bug was reported by Michael Burian <dynmail1@gassner-waagen.at>.
-
-Signed-off-by: James Chapman <jchapman@katalix.com>
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/i2c/chips/ds1337.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/i2c/chips/ds1337.c
-+++ gregkh-2.6/drivers/i2c/chips/ds1337.c
-@@ -164,9 +164,9 @@ static int ds1337_set_datetime(struct i2
- 	buf[1] = BIN2BCD(dt->tm_sec);
- 	buf[2] = BIN2BCD(dt->tm_min);
- 	buf[3] = BIN2BCD(dt->tm_hour);
--	buf[4] = BIN2BCD(dt->tm_wday) + 1;
-+	buf[4] = BIN2BCD(dt->tm_wday + 1);
- 	buf[5] = BIN2BCD(dt->tm_mday);
--	buf[6] = BIN2BCD(dt->tm_mon) + 1;
-+	buf[6] = BIN2BCD(dt->tm_mon + 1);
- 	val = dt->tm_year;
- 	if (val >= 100) {
- 		val -= 100;
diff --git a/i2c/i2c-viapro-some-adjustments.patch b/i2c/i2c-viapro-some-adjustments.patch
deleted file mode 100644
index 17a8214dd653c..0000000000000
--- a/i2c/i2c-viapro-some-adjustments.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From linux-kernel-owner+greg=40kroah.com-S964808AbVJaRv1@vger.kernel.org Mon Oct 31 10:53:34 2005
-Date: Mon, 31 Oct 2005 18:51:21 +0100
-From: Jean Delvare <khali@linux-fr.org>
-Subject: i2c-viapro: Some adjustments
-Message-Id: <20051031185121.6700d67e.khali@linux-fr.org>
-
-The big i2c-viapro SMBus driver update which went into 2.6.14-git1
-introduced a few minor issues. Nothing critical, but I would like a
-few adjustments to be merged in to fix the following problems:
-
-* VIA should not be spelled Via.
-* Frodo Looijaard and Philip Edelbrock did not write the i2c-viapro
-  driver.
-* When debugging is disabled, half of messages would be logged.
-* Drop an unneeded masking.
-* Some port reads can be avoided now that the transaction size is
-  passed as a parameter to vt596_transaction().
-* SMBus Receive Byte transactions are used for probing too (for
-  EEPROMs), so hide errors on these too.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
- Documentation/i2c/busses/i2c-viapro |    6 ++----
- drivers/i2c/busses/i2c-viapro.c     |   27 ++++++++++++++-------------
- 2 files changed, 16 insertions(+), 17 deletions(-)
-
---- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro	2005-11-02 09:24:45.000000000 -0800
-+++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro	2005-11-02 11:48:44.000000000 -0800
-@@ -7,12 +7,10 @@
-   * VIA Technologies, Inc. VT82C686A/B
-     Datasheet: Sometimes available at the VIA website
- 
--  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237
--    Datasheet: available on request from Via
-+  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R
-+    Datasheet: available on request from VIA
- 
- Authors:
--	Frodo Looijaard <frodol@dds.nl>,
--	Philip Edelbrock <phil@netroedge.com>,
- 	Kyösti Mälkki <kmalkki@cc.hut.fi>,
- 	Mark D. Studebaker <mdsxyz123@yahoo.com>,
- 	Jean Delvare <khali@linux-fr.org>
---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c	2005-11-02 09:24:58.000000000 -0800
-+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c	2005-11-02 11:48:44.000000000 -0800
-@@ -142,19 +142,18 @@
- 	/* Make sure the SMBus host is ready to start transmitting */
- 	if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
- 		dev_dbg(&vt596_adapter.dev, "SMBus busy (0x%02x). "
--			"Resetting... ", temp);
-+			"Resetting...\n", temp);
- 
- 		outb_p(temp, SMBHSTSTS);
- 		if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
--			printk("Failed! (0x%02x)\n", temp);
-+			dev_err(&vt596_adapter.dev, "SMBus reset failed! "
-+				"(0x%02x)\n", temp);
- 			return -1;
--		} else {
--			printk("Successful!\n");
- 		}
- 	}
- 
- 	/* Start the transaction by setting bit 6 */
--	outb_p(0x40 | (size & 0x3C), SMBHSTCNT);
-+	outb_p(0x40 | size, SMBHSTCNT);
- 
- 	/* We will always wait for a fraction of a second */
- 	do {
-@@ -171,7 +170,7 @@
- 	if (temp & 0x10) {
- 		result = -1;
- 		dev_err(&vt596_adapter.dev, "Transaction failed (0x%02x)\n",
--			inb_p(SMBHSTCNT) & 0x3C);
-+			size);
- 	}
- 
- 	if (temp & 0x08) {
-@@ -180,11 +179,13 @@
- 	}
- 
- 	if (temp & 0x04) {
-+		int read = inb_p(SMBHSTADD) & 0x01;
- 		result = -1;
--		/* Quick commands are used to probe for chips, so
--		   errors are expected, and we don't want to frighten the
--		   user. */
--		if ((inb_p(SMBHSTCNT) & 0x3C) != VT596_QUICK)
-+		/* The quick and receive byte commands are used to probe
-+		   for chips, so errors are expected, and we don't want
-+		   to frighten the user. */
-+		if (!((size == VT596_QUICK && !read) ||
-+		      (size == VT596_BYTE && read)))
- 			dev_err(&vt596_adapter.dev, "Transaction error!\n");
- 	}
- 
-@@ -462,9 +463,9 @@
- 	}
- }
- 
--MODULE_AUTHOR(
--    "Frodo Looijaard <frodol@dds.nl> and "
--    "Philip Edelbrock <phil@netroedge.com>");
-+MODULE_AUTHOR("Kyosti Malkki <kmalkki@cc.hut.fi>, "
-+	      "Mark D. Studebaker <mdsxyz123@yahoo.com> and "
-+	      "Jean Delvare <khali@linux-fr.org>");
- MODULE_DESCRIPTION("vt82c596 SMBus driver");
- MODULE_LICENSE("GPL");
-