lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hwmon: hwmon vs i2c, second round (04/11)

Browse Source 
i2c_probe and i2c_detect now do the exact same thing and operate on
the same data structure, so we can have everyone call i2c_probe.

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-07-31 21:42:02 +02:00
committed by Greg Kroah-Hartman
parent b78ec31582
commit 2ed2dc3c11
35 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/chips/ds1337.c
View File

@@ -226,7 +226,7 @@ int ds1337_do_command(int bus, int cmd, void *arg)
static int ds1337_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, ds1337_detect);
return i2c_probe(adapter, &addr_data, ds1337_detect);
}
/*

4
drivers/i2c/chips/eeprom.c
View File

@@ -152,10 +152,10 @@ static struct bin_attribute eeprom_attr = {
static int eeprom_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, eeprom_detect);
return i2c_probe(adapter, &addr_data, eeprom_detect);
}
/* This function is called by i2c_detect */
/* This function is called by i2c_probe */
int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;

4
drivers/i2c/chips/max6875.c
View File

@@ -161,10 +161,10 @@ static struct bin_attribute user_eeprom_attr = {
static int max6875_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, max6875_detect);
return i2c_probe(adapter, &addr_data, max6875_detect);
}
/* This function is called by i2c_detect */
/* This function is called by i2c_probe */
static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *real_client;

4
drivers/i2c/chips/pca9539.c
View File

@@ -108,10 +108,10 @@ static struct attribute_group pca9539_defattr_group = {
static int pca9539_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, pca9539_detect);
return i2c_probe(adapter, &addr_data, pca9539_detect);
}
/* This function is called by i2c_detect */
/* This function is called by i2c_probe */
static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;

4
drivers/i2c/chips/pcf8574.c
View File

@@ -112,10 +112,10 @@ static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, pcf8574_detect);
return i2c_probe(adapter, &addr_data, pcf8574_detect);
}
/* This function is called by i2c_detect */
/* This function is called by i2c_probe */
int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;

4
drivers/i2c/chips/pcf8591.c
View File

@@ -163,10 +163,10 @@ static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
*/
static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
{
return i2c_detect(adapter, &addr_data, pcf8591_detect);
return i2c_probe(adapter, &addr_data, pcf8591_detect);
}
/* This function is called by i2c_detect */
/* This function is called by i2c_probe */
int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *new_client;