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

Commit e1995f65 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Drop I2C_CLASS_ALL 



I2C_CLASS_ALL is almost never what bus driver authors really want.
These i2c classes are really only about which devices must be probed,
not what devices can be present. As device drivers get converted to the
new i2c device driver model, only a few device types will keep relying
on probing.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarSonic Zhang <sonic.zhang@analog.com>
parent 22e965c2

drivers/i2c/busses/i2c-bfin-twi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -656,7 +656,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) 
	strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));

	strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));

	p_adap->algo = &bfin_twi_algorithm;

	p_adap->algo = &bfin_twi_algorithm;

	p_adap->algo_data = iface;

	p_adap->algo_data = iface;

	p_adap->class = I2C_CLASS_ALL;

	p_adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;

	p_adap->dev.parent = &pdev->dev;

	p_adap->dev.parent = &pdev->dev;





	rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi");

	rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi");

drivers/i2c/busses/i2c-sh7760.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -475,7 +475,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev) 




	id->adap.nr = pdev->id;

	id->adap.nr = pdev->id;

	id->adap.algo = &sh7760_i2c_algo;

	id->adap.algo = &sh7760_i2c_algo;

	id->adap.class = I2C_CLASS_ALL;

	id->adap.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;

	id->adap.retries = 3;

	id->adap.retries = 3;

	id->adap.algo_data = id;

	id->adap.algo_data = id;

	id->adap.dev.parent = &pdev->dev;

	id->adap.dev.parent = &pdev->dev;

include/linux/i2c.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -397,7 +397,6 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data) 
#define I2C_CLASS_CAM_DIGITAL	(1<<5)	/* most webcams */

#define I2C_CLASS_CAM_DIGITAL	(1<<5)	/* most webcams */

#define I2C_CLASS_SOUND		(1<<6)	/* sound devices */

#define I2C_CLASS_SOUND		(1<<6)	/* sound devices */

#define I2C_CLASS_SPD		(1<<7)	/* SPD EEPROMs and similar */

#define I2C_CLASS_SPD		(1<<7)	/* SPD EEPROMs and similar */

#define I2C_CLASS_ALL		(UINT_MAX) /* all of the above */





/* i2c_client_address_data is the struct for holding default client

/* i2c_client_address_data is the struct for holding default client

 * addresses for a driver and for the parameters supplied on the

 * addresses for a driver and for the parameters supplied on the