• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: コミット

2.4.36-stable kernel tree


コミットメタ情報

リビジョンdacc5bf399a95fc22011fd210cb523337dc2a7ab (tree)
日時2006-12-05 17:22:49
作者Jean Delvare <khali@linu...>
コミッターWilly Tarreau

ログメッセージ

[PATCH] i2c cleanup : dead code removal

Discard dead code from the i2c subsystem.

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

変更サマリ

差分

--- 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)
367367 return (retval<0)? retval : -EFAULT;
368368 /* got a better one ?? */
369369 }
370-#if 0
371- /* from asm/delay.h */
372- __delay(adap->mdelay * (loops_per_sec / 1000) );
373-#endif
374370 }
375371 return wrcount;
376372 }
@@ -384,7 +380,6 @@ static inline int readbytes(struct i2c_adapter *i2c_adap,char *buf,int count)
384380
385381 while (count > 0) {
386382 inval = i2c_inb(i2c_adap);
387-/*printk("%#02x ",inval); if ( ! (count % 16) ) printk("\n"); */
388383 if (inval>=0) {
389384 *temp = inval;
390385 rdcount++;
--- a/drivers/i2c/i2c-proc.c
+++ b/drivers/i2c/i2c-proc.c
@@ -39,8 +39,6 @@
3939 #define THIS_MODULE NULL
4040 #endif
4141
42-static int i2c_create_name(char **name, const char *prefix,
43- struct i2c_adapter *adapter, int addr);
4442 static int i2c_parse_reals(int *nrels, void *buffer, int bufsize,
4543 long *results, int magnitude);
4644 static int i2c_write_reals(int nrels, void *buffer, int *bufsize,
--- a/include/linux/i2c-algo-bit.h
+++ b/include/linux/i2c-algo-bit.h
@@ -48,8 +48,6 @@ struct i2c_algo_bit_data {
4848 int timeout; /* in jiffies */
4949 };
5050
51-#define I2C_BIT_ADAP_MAX 16
52-
5351 int i2c_bit_add_bus(struct i2c_adapter *);
5452 int i2c_bit_del_bus(struct i2c_adapter *);
5553
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -44,8 +44,6 @@ struct i2c_algo_pcf_data {
4444 int timeout;
4545 };
4646
47-#define I2C_PCF_ADAP_MAX 16
48-
4947 int i2c_pcf_add_bus(struct i2c_adapter *);
5048 int i2c_pcf_del_bus(struct i2c_adapter *);
5149
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -450,9 +450,6 @@ union i2c_smbus_data {
450450
451451 #define I2C_FUNCS 0x0705 /* Get the adapter functionality */
452452 #define I2C_RDWR 0x0707 /* Combined R/W transfer (one stop only)*/
453-#if 0
454-#define I2C_ACK_TEST 0x0710 /* See if a slave is at a specific address */
455-#endif
456453
457454 #define I2C_SMBUS 0x0720 /* SMBus-level access */
458455
旧リポジトリブラウザで表示