Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e51cc6b3 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97518588

drivers/i2c/busses/i2c-isa.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static struct i2c_algorithm isa_algorithm = { 
/* 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",

include/linux/i2c-isa.h

+3 −3
Original line number Diff line number Diff line
@@ -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

   (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 */