Messages in this thread Patch in this message | | | Date | Thu, 11 Aug 2005 23:36:49 +0200 | From | Jean Delvare <> | Subject | [PATCH] (2/7) I2C: Kill i2c_algorithm.id |
| |
Use the adapter id rather than the algorithm id to detect the i2c-isa pseudo-adapter. This saves one level of dereferencing, and the algorithm ids will soon be gone anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/i2c/busses/i2c-isa.c | 1 + include/linux/i2c-isa.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
--- linux-2.6.13-rc5.orig/drivers/i2c/busses/i2c-isa.c 2005-08-02 20:30:04.000000000 +0200 +++ linux-2.6.13-rc5/drivers/i2c/busses/i2c-isa.c 2005-08-02 20:30:24.000000000 +0200 @@ -50,6 +50,7 @@ /* There can only be one... */ static struct i2c_adapter isa_adapter = { .owner = THIS_MODULE, + .id = I2C_ALGO_ISA | I2C_HW_ISA, .class = I2C_CLASS_HWMON, .algo = &isa_algorithm, .name = "ISA main adapter", --- linux-2.6.13-rc5.orig/include/linux/i2c-isa.h 2005-08-02 20:30:04.000000000 +0200 +++ linux-2.6.13-rc5/include/linux/i2c-isa.h 2005-08-02 20:30:24.000000000 +0200 @@ -28,9 +28,9 @@ /* Detect whether we are on the isa bus. This is only useful to hybrid (i2c+isa) drivers. */ -#define i2c_is_isa_client(clientptr) \ - ((clientptr)->adapter->algo->id == I2C_ALGO_ISA) #define i2c_is_isa_adapter(adapptr) \ - ((adapptr)->algo->id == I2C_ALGO_ISA) + ((adapptr)->id == (I2C_ALGO_ISA | I2C_HW_ISA)) +#define i2c_is_isa_client(clientptr) \ + i2c_is_isa_adapter((clientptr)->adapter) #endif /* _LINUX_I2C_ISA_H */ -- Jean Delvare - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |