lotsa patches added

1 files changed, 163 insertions, 0 deletions

diff --git a/i2c/w1-possible-cleanups.patch b/i2c/w1-possible-cleanups.patch
new file mode 100644
index 0000000000000..7c3ce2154db18
--- /dev/null
+++ b/i2c/w1-possible-cleanups.patch
@@ -0,0 +1,163 @@
+From johnpol@2ka.mipt.ru Sun Apr 23 23:46:41 2006
+Date: Mon, 24 Apr 2006 10:46:14 +0400
+From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+To: GregKH <greg@kroah.com>
+Subject: W1: possible cleanups
+Message-ID: <20060424064612.GB17636@2ka.mipt.ru>
+Content-Disposition: inline
+
+This patch contains the following possible cleanups:
+- the following file did't #include the header with the prototypes for
+  it's global functions:
+  - w1_int.c
+- #if 0 the following unused global function:
+  - w1_family.c: w1_family_get()
+- make the following needlessly global functions static:
+  - w1_family.c: __w1_family_put()
+  - w1_io.c: w1_delay()
+  - w1_io.c: w1_touch_bit()
+  - w1_io.c: w1_read_8()
+- remove the following unused EXPORT_SYMBOL's:
+  - w1_family.c: w1_family_put
+  - w1_family.c: w1_family_registered
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/w1/w1.h        |    3 ---
+ drivers/w1/w1_family.c |   18 ++++++++----------
+ drivers/w1/w1_family.h |    2 --
+ drivers/w1/w1_int.c    |    1 +
+ drivers/w1/w1_io.c     |    6 +++---
+ drivers/w1/w1_io.h     |    3 ---
+ 6 files changed, 12 insertions(+), 21 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1.h
++++ gregkh-2.6/drivers/w1/w1.h
+@@ -187,11 +187,8 @@ struct w1_slave *w1_search_slave(struct 
+ void w1_search_process(struct w1_master *dev, u8 search_type);
+ struct w1_master *w1_search_master_id(u32 id);
+ 
+-void w1_delay(unsigned long);
+-u8 w1_touch_bit(struct w1_master *, int);
+ u8 w1_triplet(struct w1_master *dev, int bdir);
+ void w1_write_8(struct w1_master *, u8);
+-u8 w1_read_8(struct w1_master *);
+ int w1_reset_bus(struct w1_master *);
+ u8 w1_calc_crc8(u8 *, int);
+ void w1_write_block(struct w1_master *, const u8 *, int);
+--- gregkh-2.6.orig/drivers/w1/w1_family.c
++++ gregkh-2.6/drivers/w1/w1_family.c
+@@ -107,6 +107,12 @@ struct w1_family * w1_family_registered(
+ 	return (ret) ? f : NULL;
+ }
+ 
++static void __w1_family_put(struct w1_family *f)
++{
++	if (atomic_dec_and_test(&f->refcnt))
++		f->need_exit = 1;
++}
++
+ void w1_family_put(struct w1_family *f)
+ {
+ 	spin_lock(&w1_flock);
+@@ -114,19 +120,14 @@ void w1_family_put(struct w1_family *f)
+ 	spin_unlock(&w1_flock);
+ }
+ 
+-void __w1_family_put(struct w1_family *f)
+-{
+-	if (atomic_dec_and_test(&f->refcnt))
+-		f->need_exit = 1;
+-}
+-
++#if 0
+ void w1_family_get(struct w1_family *f)
+ {
+ 	spin_lock(&w1_flock);
+ 	__w1_family_get(f);
+ 	spin_unlock(&w1_flock);
+-
+ }
++#endif  /*  0  */
+ 
+ void __w1_family_get(struct w1_family *f)
+ {
+@@ -135,8 +136,5 @@ void __w1_family_get(struct w1_family *f
+ 	smp_mb__after_atomic_inc();
+ }
+ 
+-EXPORT_SYMBOL(w1_family_get);
+-EXPORT_SYMBOL(w1_family_put);
+-EXPORT_SYMBOL(w1_family_registered);
+ EXPORT_SYMBOL(w1_unregister_family);
+ EXPORT_SYMBOL(w1_register_family);
+--- gregkh-2.6.orig/drivers/w1/w1_family.h
++++ gregkh-2.6/drivers/w1/w1_family.h
+@@ -57,10 +57,8 @@ struct w1_family
+ 
+ extern spinlock_t w1_flock;
+ 
+-void w1_family_get(struct w1_family *);
+ void w1_family_put(struct w1_family *);
+ void __w1_family_get(struct w1_family *);
+-void __w1_family_put(struct w1_family *);
+ struct w1_family * w1_family_registered(u8);
+ void w1_unregister_family(struct w1_family *);
+ int w1_register_family(struct w1_family *);
+--- gregkh-2.6.orig/drivers/w1/w1_int.c
++++ gregkh-2.6/drivers/w1/w1_int.c
+@@ -27,6 +27,7 @@
+ #include "w1.h"
+ #include "w1_log.h"
+ #include "w1_netlink.h"
++#include "w1_int.h"
+ 
+ static u32 w1_ids = 1;
+ 
+--- gregkh-2.6.orig/drivers/w1/w1_io.c
++++ gregkh-2.6/drivers/w1/w1_io.c
+@@ -50,7 +50,7 @@ static u8 w1_crc8_table[] = {
+ 	116, 42, 200, 150, 21, 75, 169, 247, 182, 232, 10, 84, 215, 137, 107, 53
+ };
+ 
+-void w1_delay(unsigned long tm)
++static void w1_delay(unsigned long tm)
+ {
+ 	udelay(tm * w1_delay_parm);
+ }
+@@ -61,7 +61,7 @@ static u8 w1_read_bit(struct w1_master *
+ /**
+  * Generates a write-0 or write-1 cycle and samples the level.
+  */
+-u8 w1_touch_bit(struct w1_master *dev, int bit)
++static u8 w1_touch_bit(struct w1_master *dev, int bit)
+ {
+ 	if (dev->bus_master->touch_bit)
+ 		return dev->bus_master->touch_bit(dev->bus_master->data, bit);
+@@ -177,7 +177,7 @@ u8 w1_triplet(struct w1_master *dev, int
+  * @param dev     the master device
+  * @return        the byte read
+  */
+-u8 w1_read_8(struct w1_master * dev)
++static u8 w1_read_8(struct w1_master * dev)
+ {
+ 	int i;
+ 	u8 res = 0;
+--- gregkh-2.6.orig/drivers/w1/w1_io.h
++++ gregkh-2.6/drivers/w1/w1_io.h
+@@ -24,11 +24,8 @@
+ 
+ #include "w1.h"
+ 
+-void w1_delay(unsigned long);
+-u8 w1_touch_bit(struct w1_master *, int);
+ u8 w1_triplet(struct w1_master *dev, int bdir);
+ void w1_write_8(struct w1_master *, u8);
+-u8 w1_read_8(struct w1_master *);
+ int w1_reset_bus(struct w1_master *);
+ u8 w1_calc_crc8(u8 *, int);
+ void w1_write_block(struct w1_master *, const u8 *, int);