[PATCH] i2c cleanup : dead code removal

Discard dead code from the i2c subsystem.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/i2c/i2c-algo-bit.c b/drivers/i2c/i2c-algo-bit.c
index d66424c..f128f1e 100644 (file)
--- a/drivers/i2c/i2c-algo-bit.c
+++ b/drivers/i2c/i2c-algo-bit.c
@@ -367,10 +367,6 @@ static int sendbytes(struct i2c_adapter *i2c_adap,const char *buf, int count)
                        return (retval<0)? retval : -EFAULT;
                                /* got a better one ?? */
                }
-#if 0
-               /* from asm/delay.h */
-               __delay(adap->mdelay * (loops_per_sec / 1000) );
-#endif
        }
        return wrcount;
 }
@@ -384,7 +380,6 @@ static inline int readbytes(struct i2c_adapter *i2c_adap,char *buf,int count)
 
        while (count > 0) {
                inval = i2c_inb(i2c_adap);
-/*printk("%#02x ",inval); if ( ! (count % 16) ) printk("\n"); */
                if (inval>=0) {
                        *temp = inval;
                        rdcount++;

diff --git a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c
index 92cbcf3..5d20897 100644 (file)
--- a/drivers/i2c/i2c-proc.c
+++ b/drivers/i2c/i2c-proc.c
@@ -39,8 +39,6 @@
 #define THIS_MODULE NULL
 #endif
 
-static int i2c_create_name(char **name, const char *prefix,
-                              struct i2c_adapter *adapter, int addr);
 static int i2c_parse_reals(int *nrels, void *buffer, int bufsize,
                               long *results, int magnitude);
 static int i2c_write_reals(int nrels, void *buffer, int *bufsize,

diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h
index fea550f..e8b0e8a 100644 (file)
--- a/include/linux/i2c-algo-bit.h
+++ b/include/linux/i2c-algo-bit.h
@@ -48,8 +48,6 @@ struct i2c_algo_bit_data {
        int timeout;            /* in jiffies */
 };
 
-#define I2C_BIT_ADAP_MAX       16
-
 int i2c_bit_add_bus(struct i2c_adapter *);
 int i2c_bit_del_bus(struct i2c_adapter *);
 

diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h
index 892d737..3ac7d25 100644 (file)
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -44,8 +44,6 @@ struct i2c_algo_pcf_data {
        int timeout;
 };
 
-#define I2C_PCF_ADAP_MAX       16
-
 int i2c_pcf_add_bus(struct i2c_adapter *);
 int i2c_pcf_del_bus(struct i2c_adapter *);
 

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 867390f..fae04e0 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -450,9 +450,6 @@ union i2c_smbus_data {
 
 #define I2C_FUNCS      0x0705  /* Get the adapter functionality */
 #define I2C_RDWR       0x0707  /* Combined R/W transfer (one stop only)*/
-#if 0
-#define I2C_ACK_TEST   0x0710  /* See if a slave is at a specific address */
-#endif
 
 #define I2C_SMBUS      0x0720  /* SMBus-level access */