w1 and usb patches added

2 files changed, 187 insertions, 0 deletions

diff --git a/i2c/w1-cleanups.patch b/i2c/w1-cleanups.patch
new file mode 100644
index 0000000000000..8bf8ffe221a46
--- /dev/null
+++ b/i2c/w1-cleanups.patch
@@ -0,0 +1,103 @@
+From johnpol@2ka.mipt.ru Tue Apr  4 09:38:51 2006
+Date: Tue, 4 Apr 2006 20:35:22 +0400
+From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+To: Adrian Bunk <bunk@stusta.de>
+Cc: Andrew Morton <akpm@osdl.org>, Greg Kroah-Hartman <gregkh@suse.de>, linux-kernel@vger.kernel.org
+Subject: W1: cleanups
+Message-ID: <20060404163522.GA29486@2ka.mipt.ru>
+Content-Disposition: inline
+
+Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the
+completely new functionality.
+
+Shame-shame-shame on me.
+
+Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/w1.c     |    6 ++++--
+ drivers/w1/w1.h     |   10 ++++++++++
+ drivers/w1/w1_int.c |   12 +-----------
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1.c
++++ gregkh-2.6/drivers/w1/w1.c
+@@ -214,11 +214,12 @@ struct device w1_master_device = {
+ 	.release = &w1_master_release
+ };
+ 
+-struct device_driver w1_slave_driver = {
++static struct device_driver w1_slave_driver = {
+ 	.name = "w1_slave_driver",
+ 	.bus = &w1_bus_type,
+ };
+ 
++#if 0
+ struct device w1_slave_device = {
+ 	.parent = NULL,
+ 	.bus = &w1_bus_type,
+@@ -226,6 +227,7 @@ struct device w1_slave_device = {
+ 	.driver = &w1_slave_driver,
+ 	.release = &w1_slave_release
+ };
++#endif  /*  0  */
+ 
+ static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+@@ -383,7 +385,7 @@ int w1_create_master_attributes(struct w
+ 	return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);
+ }
+ 
+-void w1_destroy_master_attributes(struct w1_master *master)
++static void w1_destroy_master_attributes(struct w1_master *master)
+ {
+ 	sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
+ }
+--- gregkh-2.6.orig/drivers/w1/w1.h
++++ gregkh-2.6/drivers/w1/w1.h
+@@ -213,6 +213,16 @@ static inline struct w1_master* dev_to_w
+ 	return container_of(dev, struct w1_master, dev);
+ }
+ 
++extern struct device_driver w1_master_driver;
++extern struct bus_type w1_bus_type;
++extern struct device w1_master_device;
++extern int w1_max_slave_count;
++extern int w1_max_slave_ttl;
++extern struct list_head w1_masters;
++extern struct mutex w1_mlock;
++
++extern int w1_process(void *);
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* __W1_H */
+--- gregkh-2.6.orig/drivers/w1/w1_int.c
++++ gregkh-2.6/drivers/w1/w1_int.c
+@@ -30,16 +30,6 @@
+ 
+ static u32 w1_ids = 1;
+ 
+-extern struct device_driver w1_master_driver;
+-extern struct bus_type w1_bus_type;
+-extern struct device w1_master_device;
+-extern int w1_max_slave_count;
+-extern int w1_max_slave_ttl;
+-extern struct list_head w1_masters;
+-extern struct mutex w1_mlock;
+-
+-extern int w1_process(void *);
+-
+ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
+ 				       struct device_driver *driver,
+ 				       struct device *device)
+@@ -96,7 +86,7 @@ static struct w1_master * w1_alloc_dev(u
+ 	return dev;
+ }
+ 
+-void w1_free_dev(struct w1_master *dev)
++static void w1_free_dev(struct w1_master *dev)
+ {
+ 	device_unregister(&dev->dev);
+ }
diff --git a/i2c/w1-exports.patch b/i2c/w1-exports.patch
new file mode 100644
index 0000000000000..ee9e48a7b915e
--- /dev/null
+++ b/i2c/w1-exports.patch
@@ -0,0 +1,84 @@
+From akpm@osdl.org Mon Apr  3 22:52:19 2006
+Message-Id: <200604040552.k345q7tk016068@shell0.pdx.osdl.net>
+Subject: w1 exports
+To: akpm@osdl.org, greg@kroah.com, johnpol@2ka.mipt.ru, mm-commits@vger.kernel.org
+From: akpm@osdl.org
+Date: Mon, 03 Apr 2006 22:51:17 -0700
+
+
+From: Andrew Morton <akpm@osdl.org>
+
+WARNING: "w1_read_block" [drivers/w1/slaves/w1_therm.ko] undefined!
+WARNING: "w1_write_8" [drivers/w1/slaves/w1_therm.ko] undefined!
+WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_therm.ko] undefined!
+WARNING: "w1_reset_bus" [drivers/w1/slaves/w1_ds2433.ko] undefined!
+WARNING: "w1_write_8" [drivers/w1/slaves/w1_ds2433.ko] undefined!
+WARNING: "w1_read_block" [drivers/w1/slaves/w1_ds2433.ko] undefined!
+WARNING: "w1_write_block" [drivers/w1/slaves/w1_ds2433.ko] undefined!
+WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_ds2433.ko] undefined!
+
+Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/w1_io.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1_io.c
++++ gregkh-2.6/drivers/w1/w1_io.c
+@@ -23,6 +23,7 @@
+ 
+ #include <linux/delay.h>
+ #include <linux/moduleparam.h>
++#include <linux/module.h>
+ 
+ #include "w1.h"
+ #include "w1_log.h"
+@@ -107,6 +108,7 @@ void w1_write_8(struct w1_master *dev, u
+ 		for (i = 0; i < 8; ++i)
+ 			w1_touch_bit(dev, (byte >> i) & 0x1);
+ }
++EXPORT_SYMBOL_GPL(w1_write_8);
+ 
+ 
+ /**
+@@ -207,6 +209,7 @@ void w1_write_block(struct w1_master *de
+ 		for (i = 0; i < len; ++i)
+ 			w1_write_8(dev, buf[i]);
+ }
++EXPORT_SYMBOL_GPL(w1_write_block);
+ 
+ /**
+  * Reads a series of bytes.
+@@ -231,6 +234,7 @@ u8 w1_read_block(struct w1_master *dev, 
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL_GPL(w1_read_block);
+ 
+ /**
+  * Issues a reset bus sequence.
+@@ -256,6 +260,7 @@ int w1_reset_bus(struct w1_master *dev)
+ 
+ 	return result;
+ }
++EXPORT_SYMBOL_GPL(w1_reset_bus);
+ 
+ u8 w1_calc_crc8(u8 * data, int len)
+ {
+@@ -266,6 +271,7 @@ u8 w1_calc_crc8(u8 * data, int len)
+ 
+ 	return crc;
+ }
++EXPORT_SYMBOL_GPL(w1_calc_crc8);
+ 
+ void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb)
+ {
+@@ -298,5 +304,4 @@ int w1_reset_select_slave(struct w1_slav
+ 	}
+ 	return 0;
+ }
+-
+-EXPORT_SYMBOL_GPL(w1_calc_crc8);
++EXPORT_SYMBOL_GPL(w1_reset_select_slave);