diff options
Diffstat (limited to 'drivers/i2c/algos')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-ite.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sgi.c | 1 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sibyte.c | 2 |
6 files changed, 0 insertions, 11 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 6060b10ab0ce..df05df1a0ef6 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
@@ -539,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap) | |||
539 | DEB2(dev_dbg(&adap->dev, "hw routines registered.\n")); | 539 | DEB2(dev_dbg(&adap->dev, "hw routines registered.\n")); |
540 | 540 | ||
541 | /* register new adapter to i2c module... */ | 541 | /* register new adapter to i2c module... */ |
542 | |||
543 | adap->id |= I2C_ALGO_BIT; | ||
544 | adap->algo = &i2c_bit_algo; | 542 | adap->algo = &i2c_bit_algo; |
545 | 543 | ||
546 | adap->timeout = 100; /* default values, should */ | 544 | adap->timeout = 100; /* default values, should */ |
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c index b460e57216e1..2db7bfc85225 100644 --- a/drivers/i2c/algos/i2c-algo-ite.c +++ b/drivers/i2c/algos/i2c-algo-ite.c | |||
@@ -736,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap) | |||
736 | adap->name)); | 736 | adap->name)); |
737 | 737 | ||
738 | /* register new adapter to i2c module... */ | 738 | /* register new adapter to i2c module... */ |
739 | |||
740 | adap->id |= I2C_ALGO_IIC; | ||
741 | adap->algo = &iic_algo; | 739 | adap->algo = &iic_algo; |
742 | 740 | ||
743 | adap->timeout = 100; /* default values, should */ | 741 | adap->timeout = 100; /* default values, should */ |
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index be2c8abc6682..beb10edfe9c1 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap) | |||
369 | int rval; | 369 | int rval; |
370 | 370 | ||
371 | /* register new adapter to i2c module... */ | 371 | /* register new adapter to i2c module... */ |
372 | |||
373 | adap->id |= I2C_ALGO_PCA; | ||
374 | adap->algo = &pca_algo; | 372 | adap->algo = &pca_algo; |
375 | 373 | ||
376 | adap->timeout = 100; /* default values, should */ | 374 | adap->timeout = 100; /* default values, should */ |
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 95f023ad8c62..6e498df1f717 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c | |||
@@ -474,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap) | |||
474 | DEB2(dev_dbg(&adap->dev, "hw routines registered.\n")); | 474 | DEB2(dev_dbg(&adap->dev, "hw routines registered.\n")); |
475 | 475 | ||
476 | /* register new adapter to i2c module... */ | 476 | /* register new adapter to i2c module... */ |
477 | |||
478 | adap->id |= I2C_ALGO_PCF; | ||
479 | adap->algo = &pcf_algo; | 477 | adap->algo = &pcf_algo; |
480 | 478 | ||
481 | adap->timeout = 100; /* default values, should */ | 479 | adap->timeout = 100; /* default values, should */ |
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c index 142505105d6f..2f8df81317ff 100644 --- a/drivers/i2c/algos/i2c-algo-sgi.c +++ b/drivers/i2c/algos/i2c-algo-sgi.c | |||
@@ -167,7 +167,6 @@ static struct i2c_algorithm sgi_algo = { | |||
167 | */ | 167 | */ |
168 | int i2c_sgi_add_bus(struct i2c_adapter *adap) | 168 | int i2c_sgi_add_bus(struct i2c_adapter *adap) |
169 | { | 169 | { |
170 | adap->id |= I2C_ALGO_SGI; | ||
171 | adap->algo = &sgi_algo; | 170 | adap->algo = &sgi_algo; |
172 | 171 | ||
173 | return i2c_add_adapter(adap); | 172 | return i2c_add_adapter(adap); |
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index c01108ae7b69..8ed5ad12552f 100644 --- a/drivers/i2c/algos/i2c-algo-sibyte.c +++ b/drivers/i2c/algos/i2c-algo-sibyte.c | |||
@@ -149,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed) | |||
149 | struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data; | 149 | struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data; |
150 | 150 | ||
151 | /* register new adapter to i2c module... */ | 151 | /* register new adapter to i2c module... */ |
152 | |||
153 | i2c_adap->id |= I2C_ALGO_SIBYTE; | ||
154 | i2c_adap->algo = &i2c_sibyte_algo; | 152 | i2c_adap->algo = &i2c_sibyte_algo; |
155 | 153 | ||
156 | /* Set the frequency to 100 kHz */ | 154 | /* Set the frequency to 100 kHz */ |