hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] I2C: Kill i2c_algorithm.id (2/7) 

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jean Delvare 2005-08-11 23:36:49 +02:00 committed by Greg Kroah-Hartman
parent 975185880d
commit e51cc6b3a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/i2c/busses/i2c-isa.c
View File

@ -50,6 +50,7 @@ static struct i2c_algorithm isa_algorithm = {
/* There can only be one... */ /* There can only be one... */
static struct i2c_adapter isa_adapter = { static struct i2c_adapter isa_adapter = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.id = I2C_ALGO_ISA | I2C_HW_ISA,
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.algo = &isa_algorithm, .algo = &isa_algorithm,
.name = "ISA main adapter", .name = "ISA main adapter",

6
include/linux/i2c-isa.h
View File

@ -28,9 +28,9 @@ extern int i2c_isa_del_driver(struct i2c_driver *driver);
/* Detect whether we are on the isa bus. This is only useful to hybrid /* Detect whether we are on the isa bus. This is only useful to hybrid
(i2c+isa) drivers. */ (i2c+isa) drivers. */
#define i2c_is_isa_client(clientptr) \
((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
#define i2c_is_isa_adapter(adapptr) \ #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 */ #endif /* _LINUX_I2C_ISA_H */