From: Jean Delvare <khali@linux-fr.org>
To: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] (3/7) I2C: Kill i2c_algorithm.id
Date: Thu, 11 Aug 2005 23:38:52 +0200 [thread overview]
Message-ID: <20050811233852.6f11b2f9.khali@linux-fr.org> (raw)
In-Reply-To: <20050811231828.3e7f5837.khali@linux-fr.org>
Don't rely on i2c_algorithm.id to alter the i2c adapter's id, use the
I2C_ALGO_* value directly instead, because i2c_algorithm will soon
have no id member no more.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/i2c/algos/i2c-algo-bit.c | 2 +-
drivers/i2c/algos/i2c-algo-ite.c | 2 +-
drivers/i2c/algos/i2c-algo-pca.c | 2 +-
drivers/i2c/algos/i2c-algo-pcf.c | 2 +-
drivers/i2c/algos/i2c-algo-sgi.c | 2 +-
drivers/i2c/algos/i2c-algo-sibyte.c | 2 +-
drivers/i2c/busses/i2c-ibm_iic.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-bit.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-bit.c 2005-08-02 20:43:50.000000000 +0200
@@ -541,7 +541,7 @@
/* register new adapter to i2c module... */
- adap->id |= i2c_bit_algo.id;
+ adap->id |= I2C_ALGO_BIT;
adap->algo = &i2c_bit_algo;
adap->timeout = 100; /* default values, should */
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-ite.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-ite.c 2005-08-02 20:43:50.000000000 +0200
@@ -738,7 +738,7 @@
/* register new adapter to i2c module... */
- adap->id |= iic_algo.id;
+ adap->id |= I2C_ALGO_IIC;
adap->algo = &iic_algo;
adap->timeout = 100; /* default values, should */
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-pca.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-pca.c 2005-08-02 20:43:50.000000000 +0200
@@ -371,7 +371,7 @@
/* register new adapter to i2c module... */
- adap->id |= pca_algo.id;
+ adap->id |= I2C_ALGO_PCA;
adap->algo = &pca_algo;
adap->timeout = 100; /* default values, should */
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-pcf.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-pcf.c 2005-08-02 20:43:50.000000000 +0200
@@ -476,7 +476,7 @@
/* register new adapter to i2c module... */
- adap->id |= pcf_algo.id;
+ adap->id |= I2C_ALGO_PCF;
adap->algo = &pcf_algo;
adap->timeout = 100; /* default values, should */
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-sgi.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-sgi.c 2005-08-02 20:43:50.000000000 +0200
@@ -168,7 +168,7 @@
*/
int i2c_sgi_add_bus(struct i2c_adapter *adap)
{
- adap->id |= sgi_algo.id;
+ adap->id |= I2C_ALGO_SGI;
adap->algo = &sgi_algo;
return i2c_add_adapter(adap);
--- linux-2.6.13-rc5.orig/drivers/i2c/busses/i2c-ibm_iic.c 2005-08-02 20:30:04.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/busses/i2c-ibm_iic.c 2005-08-02 20:43:50.000000000 +0200
@@ -726,7 +726,7 @@
adap = &dev->adap;
strcpy(adap->name, "IBM IIC");
i2c_set_adapdata(adap, dev);
- adap->id = I2C_HW_OCP | iic_algo.id;
+ adap->id = I2C_ALGO_OCP | I2C_HW_OCP;
adap->algo = &iic_algo;
adap->client_register = NULL;
adap->client_unregister = NULL;
--- linux-2.6.13-rc5.orig/drivers/i2c/algos/i2c-algo-sibyte.c 2005-08-02 20:43:50.000000000 +0200
+++ linux-2.6.13-rc5/drivers/i2c/algos/i2c-algo-sibyte.c 2005-08-02 20:44:27.000000000 +0200
@@ -151,7 +151,7 @@
/* register new adapter to i2c module... */
- i2c_adap->id |= i2c_sibyte_algo.id;
+ i2c_adap->id |= I2C_ALGO_SIBYTE;
i2c_adap->algo = &i2c_sibyte_algo;
/* Set the frequency to 100 kHz */
--
Jean Delvare
next prev parent reply other threads:[~2005-08-11 21:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-11 21:18 [PATCH] (0/7) I2C: Kill i2c_algorithm.{name,id} Jean Delvare
2005-08-11 21:33 ` [PATCH] (1/7) I2C: Kill i2c_algorithm.name Jean Delvare
2005-08-11 21:36 ` [PATCH] (2/7) I2C: Kill i2c_algorithm.id Jean Delvare
2005-08-11 21:38 ` Jean Delvare [this message]
2005-08-11 21:40 ` [PATCH] (4/7) " Jean Delvare
2005-08-11 21:41 ` [PATCH] (5/7) " Jean Delvare
2005-08-11 21:51 ` [PATCH] (6/7) " Jean Delvare
2005-08-11 21:52 ` [PATCH] (7/7) " Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050811233852.6f11b2f9.khali@linux-fr.org \
--to=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox