Commit 0e11d70c authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

[PATCH] I2C: Kill i2c_client.id (1/5)

(1/5) Stop using i2c_client.id in i2c/chips drivers (mostly hardware
      monitoring drivers).

Drivers affected:
* adm1021
* adm1025
* adm1026
* adm1031
* ds1621
* fscher
* gl518sm
* isp1301_omap
* lm75
* lm77
* lm80
* lm83
* lm85
* lm87
* lm90
* max1619
* pcf8574
* pcf8591
* rtc8564
* smsc47m1
* w83l785ts

The vast majority of these drivers simply defined the i2c_client id
struct member but never used it, so they are not affected at all by the
change. Exceptions are:

* lm85 and rtc8564, which would at least display the id in a debug
message when assigning it. Not really useful though, as the id was then
never used.

* adm1026, which used the assigned id in all driver messages. However,
since dev_* calls will append the bus number and client address to these
messages, the id information is redundant and can go away. Also, the
driver would allow some GPIO reprogramming on the first client only
(id=0) and removing the id doesn't allow that anymore. I would restore a
similar functionality if needed, but the ADM1026 chip is found on very
few motherboards and none of these has more than one ADM1026 chip AFAIK,
so it doesn't seem to be worth the effort.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 25fcc319
...@@ -147,8 +147,6 @@ static struct i2c_driver adm1021_driver = { ...@@ -147,8 +147,6 @@ static struct i2c_driver adm1021_driver = {
.detach_client = adm1021_detach_client, .detach_client = adm1021_detach_client,
}; };
static int adm1021_id;
#define show(value) \ #define show(value) \
static ssize_t show_##value(struct device *dev, char *buf) \ static ssize_t show_##value(struct device *dev, char *buf) \
{ \ { \
...@@ -299,8 +297,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -299,8 +297,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, type_name, I2C_NAME_SIZE); strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
new_client->id = adm1021_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -147,12 +147,6 @@ struct adm1025_data { ...@@ -147,12 +147,6 @@ struct adm1025_data {
u8 vrm; u8 vrm;
}; };
/*
* Internal variables
*/
static int adm1025_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -397,7 +391,6 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -397,7 +391,6 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */ /* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = adm1025_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -313,8 +313,6 @@ static struct i2c_driver adm1026_driver = { ...@@ -313,8 +313,6 @@ static struct i2c_driver adm1026_driver = {
.detach_client = adm1026_detach_client, .detach_client = adm1026_detach_client,
}; };
static int adm1026_id;
int adm1026_attach_adapter(struct i2c_adapter *adapter) int adm1026_attach_adapter(struct i2c_adapter *adapter)
{ {
if (!(adapter->class & I2C_CLASS_HWMON)) { if (!(adapter->class & I2C_CLASS_HWMON)) {
...@@ -363,49 +361,47 @@ void adm1026_init_client(struct i2c_client *client) ...@@ -363,49 +361,47 @@ void adm1026_init_client(struct i2c_client *client)
int value, i; int value, i;
struct adm1026_data *data = i2c_get_clientdata(client); struct adm1026_data *data = i2c_get_clientdata(client);
dev_dbg(&client->dev,"(%d): Initializing device\n", client->id); dev_dbg(&client->dev, "Initializing device\n");
/* Read chip config */ /* Read chip config */
data->config1 = adm1026_read_value(client, ADM1026_REG_CONFIG1); data->config1 = adm1026_read_value(client, ADM1026_REG_CONFIG1);
data->config2 = adm1026_read_value(client, ADM1026_REG_CONFIG2); data->config2 = adm1026_read_value(client, ADM1026_REG_CONFIG2);
data->config3 = adm1026_read_value(client, ADM1026_REG_CONFIG3); data->config3 = adm1026_read_value(client, ADM1026_REG_CONFIG3);
/* Inform user of chip config */ /* Inform user of chip config */
dev_dbg(&client->dev, "(%d): ADM1026_REG_CONFIG1 is: 0x%02x\n", dev_dbg(&client->dev, "ADM1026_REG_CONFIG1 is: 0x%02x\n",
client->id, data->config1); data->config1);
if ((data->config1 & CFG1_MONITOR) == 0) { if ((data->config1 & CFG1_MONITOR) == 0) {
dev_dbg(&client->dev, "(%d): Monitoring not currently " dev_dbg(&client->dev, "Monitoring not currently "
"enabled.\n", client->id); "enabled.\n");
} }
if (data->config1 & CFG1_INT_ENABLE) { if (data->config1 & CFG1_INT_ENABLE) {
dev_dbg(&client->dev, "(%d): SMBALERT interrupts are " dev_dbg(&client->dev, "SMBALERT interrupts are "
"enabled.\n", client->id); "enabled.\n");
} }
if (data->config1 & CFG1_AIN8_9) { if (data->config1 & CFG1_AIN8_9) {
dev_dbg(&client->dev, "(%d): in8 and in9 enabled. " dev_dbg(&client->dev, "in8 and in9 enabled. "
"temp3 disabled.\n", client->id); "temp3 disabled.\n");
} else { } else {
dev_dbg(&client->dev, "(%d): temp3 enabled. in8 and " dev_dbg(&client->dev, "temp3 enabled. in8 and "
"in9 disabled.\n", client->id); "in9 disabled.\n");
} }
if (data->config1 & CFG1_THERM_HOT) { if (data->config1 & CFG1_THERM_HOT) {
dev_dbg(&client->dev, "(%d): Automatic THERM, PWM, " dev_dbg(&client->dev, "Automatic THERM, PWM, "
"and temp limits enabled.\n", client->id); "and temp limits enabled.\n");
} }
value = data->config3; value = data->config3;
if (data->config3 & CFG3_GPIO16_ENABLE) { if (data->config3 & CFG3_GPIO16_ENABLE) {
dev_dbg(&client->dev, "(%d): GPIO16 enabled. THERM" dev_dbg(&client->dev, "GPIO16 enabled. THERM"
"pin disabled.\n", client->id); "pin disabled.\n");
} else { } else {
dev_dbg(&client->dev, "(%d): THERM pin enabled. " dev_dbg(&client->dev, "THERM pin enabled. "
"GPIO16 disabled.\n", client->id); "GPIO16 disabled.\n");
} }
if (data->config3 & CFG3_VREF_250) { if (data->config3 & CFG3_VREF_250) {
dev_dbg(&client->dev, "(%d): Vref is 2.50 Volts.\n", dev_dbg(&client->dev, "Vref is 2.50 Volts.\n");
client->id);
} else { } else {
dev_dbg(&client->dev, "(%d): Vref is 1.82 Volts.\n", dev_dbg(&client->dev, "Vref is 1.82 Volts.\n");
client->id);
} }
/* Read and pick apart the existing GPIO configuration */ /* Read and pick apart the existing GPIO configuration */
value = 0; value = 0;
...@@ -423,12 +419,11 @@ void adm1026_init_client(struct i2c_client *client) ...@@ -423,12 +419,11 @@ void adm1026_init_client(struct i2c_client *client)
adm1026_print_gpio(client); adm1026_print_gpio(client);
/* If the user asks us to reprogram the GPIO config, then /* If the user asks us to reprogram the GPIO config, then
* do it now. But only if this is the first ADM1026. * do it now.
*/ */
if (client->id == 0 if (gpio_input[0] != -1 || gpio_output[0] != -1
&& (gpio_input[0] != -1 || gpio_output[0] != -1
|| gpio_inverted[0] != -1 || gpio_normal[0] != -1 || gpio_inverted[0] != -1 || gpio_normal[0] != -1
|| gpio_fan[0] != -1)) { || gpio_fan[0] != -1) {
adm1026_fixup_gpio(client); adm1026_fixup_gpio(client);
} }
...@@ -448,8 +443,7 @@ void adm1026_init_client(struct i2c_client *client) ...@@ -448,8 +443,7 @@ void adm1026_init_client(struct i2c_client *client)
value = adm1026_read_value(client, ADM1026_REG_CONFIG1); value = adm1026_read_value(client, ADM1026_REG_CONFIG1);
/* Set MONITOR, clear interrupt acknowledge and s/w reset */ /* Set MONITOR, clear interrupt acknowledge and s/w reset */
value = (value | CFG1_MONITOR) & (~CFG1_INT_CLEAR & ~CFG1_RESET); value = (value | CFG1_MONITOR) & (~CFG1_INT_CLEAR & ~CFG1_RESET);
dev_dbg(&client->dev, "(%d): Setting CONFIG to: 0x%02x\n", dev_dbg(&client->dev, "Setting CONFIG to: 0x%02x\n", value);
client->id, value);
data->config1 = value; data->config1 = value;
adm1026_write_value(client, ADM1026_REG_CONFIG1, value); adm1026_write_value(client, ADM1026_REG_CONFIG1, value);
...@@ -467,31 +461,30 @@ void adm1026_print_gpio(struct i2c_client *client) ...@@ -467,31 +461,30 @@ void adm1026_print_gpio(struct i2c_client *client)
struct adm1026_data *data = i2c_get_clientdata(client); struct adm1026_data *data = i2c_get_clientdata(client);
int i; int i;
dev_dbg(&client->dev, "(%d): GPIO config is:", client->id); dev_dbg(&client->dev, "GPIO config is:");
for (i = 0;i <= 7;++i) { for (i = 0;i <= 7;++i) {
if (data->config2 & (1 << i)) { if (data->config2 & (1 << i)) {
dev_dbg(&client->dev, "\t(%d): %sGP%s%d\n", client->id, dev_dbg(&client->dev, "\t%sGP%s%d\n",
data->gpio_config[i] & 0x02 ? "" : "!", data->gpio_config[i] & 0x02 ? "" : "!",
data->gpio_config[i] & 0x01 ? "OUT" : "IN", data->gpio_config[i] & 0x01 ? "OUT" : "IN",
i); i);
} else { } else {
dev_dbg(&client->dev, "\t(%d): FAN%d\n", dev_dbg(&client->dev, "\tFAN%d\n", i);
client->id, i);
} }
} }
for (i = 8;i <= 15;++i) { for (i = 8;i <= 15;++i) {
dev_dbg(&client->dev, "\t(%d): %sGP%s%d\n", client->id, dev_dbg(&client->dev, "\t%sGP%s%d\n",
data->gpio_config[i] & 0x02 ? "" : "!", data->gpio_config[i] & 0x02 ? "" : "!",
data->gpio_config[i] & 0x01 ? "OUT" : "IN", data->gpio_config[i] & 0x01 ? "OUT" : "IN",
i); i);
} }
if (data->config3 & CFG3_GPIO16_ENABLE) { if (data->config3 & CFG3_GPIO16_ENABLE) {
dev_dbg(&client->dev, "\t(%d): %sGP%s16\n", client->id, dev_dbg(&client->dev, "\t%sGP%s16\n",
data->gpio_config[16] & 0x02 ? "" : "!", data->gpio_config[16] & 0x02 ? "" : "!",
data->gpio_config[16] & 0x01 ? "OUT" : "IN"); data->gpio_config[16] & 0x01 ? "OUT" : "IN");
} else { } else {
/* GPIO16 is THERM */ /* GPIO16 is THERM */
dev_dbg(&client->dev, "\t(%d): THERM\n", client->id); dev_dbg(&client->dev, "\tTHERM\n");
} }
} }
...@@ -582,8 +575,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) ...@@ -582,8 +575,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
if (!data->valid if (!data->valid
|| (jiffies - data->last_reading > ADM1026_DATA_INTERVAL)) { || (jiffies - data->last_reading > ADM1026_DATA_INTERVAL)) {
/* Things that change quickly */ /* Things that change quickly */
dev_dbg(&client->dev,"(%d): Reading sensor values\n", dev_dbg(&client->dev,"Reading sensor values\n");
client->id);
for (i = 0;i <= 16;++i) { for (i = 0;i <= 16;++i) {
data->in[i] = data->in[i] =
adm1026_read_value(client, ADM1026_REG_IN[i]); adm1026_read_value(client, ADM1026_REG_IN[i]);
...@@ -631,8 +623,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) ...@@ -631,8 +623,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
if (!data->valid || (jiffies - data->last_config > if (!data->valid || (jiffies - data->last_config >
ADM1026_CONFIG_INTERVAL)) { ADM1026_CONFIG_INTERVAL)) {
/* Things that don't change often */ /* Things that don't change often */
dev_dbg(&client->dev, "(%d): Reading config values\n", dev_dbg(&client->dev, "Reading config values\n");
client->id);
for (i = 0;i <= 16;++i) { for (i = 0;i <= 16;++i) {
data->in_min[i] = adm1026_read_value(client, data->in_min[i] = adm1026_read_value(client,
ADM1026_REG_IN_MIN[i]); ADM1026_REG_IN_MIN[i]);
...@@ -712,8 +703,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) ...@@ -712,8 +703,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
data->last_config = jiffies; data->last_config = jiffies;
}; /* last_config */ }; /* last_config */
dev_dbg(&client->dev, "(%d): Setting VID from GPIO11-15.\n", dev_dbg(&client->dev, "Setting VID from GPIO11-15.\n");
client->id);
data->vid = (data->gpio >> 11) & 0x1f; data->vid = (data->gpio >> 11) & 0x1f;
data->valid = 1; data->valid = 1;
up(&data->update_lock); up(&data->update_lock);
...@@ -1608,16 +1598,10 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, ...@@ -1608,16 +1598,10 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
strlcpy(new_client->name, type_name, I2C_NAME_SIZE); strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
/* Fill in the remaining client fields */ /* Fill in the remaining client fields */
new_client->id = adm1026_id++;
data->type = kind; data->type = kind;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
dev_dbg(&new_client->dev, "(%d): Assigning ID %d to %s at %d,0x%02x\n",
new_client->id, new_client->id, new_client->name,
i2c_adapter_id(new_client->adapter),
new_client->addr);
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client))) if ((err = i2c_attach_client(new_client)))
goto exitfree; goto exitfree;
......
...@@ -110,8 +110,6 @@ static struct i2c_driver adm1031_driver = { ...@@ -110,8 +110,6 @@ static struct i2c_driver adm1031_driver = {
.detach_client = adm1031_detach_client, .detach_client = adm1031_detach_client,
}; };
static int adm1031_id;
static inline u8 adm1031_read_value(struct i2c_client *client, u8 reg) static inline u8 adm1031_read_value(struct i2c_client *client, u8 reg)
{ {
return i2c_smbus_read_byte_data(client, reg); return i2c_smbus_read_byte_data(client, reg);
...@@ -781,8 +779,6 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -781,8 +779,6 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
data->chip_type = kind; data->chip_type = kind;
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = adm1031_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -95,8 +95,6 @@ static struct i2c_driver ds1621_driver = { ...@@ -95,8 +95,6 @@ static struct i2c_driver ds1621_driver = {
.detach_client = ds1621_detach_client, .detach_client = ds1621_detach_client,
}; };
static int ds1621_id;
/* All registers are word-sized, except for the configuration register. /* All registers are word-sized, except for the configuration register.
DS1621 uses a high-byte first convention, which is exactly opposite to DS1621 uses a high-byte first convention, which is exactly opposite to
the usual practice. */ the usual practice. */
...@@ -236,8 +234,6 @@ int ds1621_detect(struct i2c_adapter *adapter, int address, ...@@ -236,8 +234,6 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
/* Fill in remaining client fields and put it into the global list */ /* Fill in remaining client fields and put it into the global list */
strlcpy(new_client->name, "ds1621", I2C_NAME_SIZE); strlcpy(new_client->name, "ds1621", I2C_NAME_SIZE);
new_client->id = ds1621_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -150,12 +150,6 @@ struct fscher_data { ...@@ -150,12 +150,6 @@ struct fscher_data {
u8 fan_ripple[3]; /* divider for rps */ u8 fan_ripple[3]; /* divider for rps */
}; };
/*
* Internal variables
*/
static int fscher_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -337,7 +331,6 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -337,7 +331,6 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the /* Fill in the remaining client fields and put it into the
* global list */ * global list */
strlcpy(new_client->name, "fscher", I2C_NAME_SIZE); strlcpy(new_client->name, "fscher", I2C_NAME_SIZE);
new_client->id = fscher_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -158,12 +158,6 @@ static struct i2c_driver gl518_driver = { ...@@ -158,12 +158,6 @@ static struct i2c_driver gl518_driver = {
.detach_client = gl518_detach_client, .detach_client = gl518_detach_client,
}; };
/*
* Internal variables
*/
static int gl518_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -396,7 +390,6 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -396,7 +390,6 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields */ /* Fill in the remaining client fields */
strlcpy(new_client->name, "gl518sm", I2C_NAME_SIZE); strlcpy(new_client->name, "gl518sm", I2C_NAME_SIZE);
new_client->id = gl518_id++;
data->type = kind; data->type = kind;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -1503,7 +1503,6 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind) ...@@ -1503,7 +1503,6 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
isp->client.addr = address; isp->client.addr = address;
i2c_set_clientdata(&isp->client, isp); i2c_set_clientdata(&isp->client, isp);
isp->client.adapter = bus; isp->client.adapter = bus;
isp->client.id = 1301;
isp->client.driver = &isp1301_driver; isp->client.driver = &isp1301_driver;
strlcpy(isp->client.name, DRIVER_NAME, I2C_NAME_SIZE); strlcpy(isp->client.name, DRIVER_NAME, I2C_NAME_SIZE);
i2c = &isp->client; i2c = &isp->client;
......
...@@ -73,8 +73,6 @@ static struct i2c_driver lm75_driver = { ...@@ -73,8 +73,6 @@ static struct i2c_driver lm75_driver = {
.detach_client = lm75_detach_client, .detach_client = lm75_detach_client,
}; };
static int lm75_id;
#define show(value) \ #define show(value) \
static ssize_t show_##value(struct device *dev, char *buf) \ static ssize_t show_##value(struct device *dev, char *buf) \
{ \ { \
...@@ -196,8 +194,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -196,8 +194,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm75_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -81,8 +81,6 @@ static struct i2c_driver lm77_driver = { ...@@ -81,8 +81,6 @@ static struct i2c_driver lm77_driver = {
.detach_client = lm77_detach_client, .detach_client = lm77_detach_client,
}; };
static int lm77_id;
/* straight from the datasheet */ /* straight from the datasheet */
#define LM77_TEMP_MIN (-55000) #define LM77_TEMP_MIN (-55000)
#define LM77_TEMP_MAX 125000 #define LM77_TEMP_MAX 125000
...@@ -295,8 +293,6 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -295,8 +293,6 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm77_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -140,12 +140,6 @@ static struct lm80_data *lm80_update_device(struct device *dev); ...@@ -140,12 +140,6 @@ static struct lm80_data *lm80_update_device(struct device *dev);
static int lm80_read_value(struct i2c_client *client, u8 reg); static int lm80_read_value(struct i2c_client *client, u8 reg);
static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value); static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
/*
* Internal variables
*/
static int lm80_id;
/* /*
* Driver data (common to all clients) * Driver data (common to all clients)
*/ */
...@@ -425,8 +419,6 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -425,8 +419,6 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm80_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -149,12 +149,6 @@ struct lm83_data { ...@@ -149,12 +149,6 @@ struct lm83_data {
u16 alarms; /* bitvector, combined */ u16 alarms; /* bitvector, combined */
}; };
/*
* Internal variables
*/
static int lm83_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -312,7 +306,6 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -312,7 +306,6 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */ /* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm83_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -389,9 +389,6 @@ static struct i2c_driver lm85_driver = { ...@@ -389,9 +389,6 @@ static struct i2c_driver lm85_driver = {
.detach_client = lm85_detach_client, .detach_client = lm85_detach_client,
}; };
/* Unique ID assigned to each LM85 detected */
static int lm85_id;
/* 4 Fans */ /* 4 Fans */
static ssize_t show_fan(struct device *dev, char *buf, int nr) static ssize_t show_fan(struct device *dev, char *buf, int nr)
...@@ -1148,16 +1145,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address, ...@@ -1148,16 +1145,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
strlcpy(new_client->name, type_name, I2C_NAME_SIZE); strlcpy(new_client->name, type_name, I2C_NAME_SIZE);
/* Fill in the remaining client fields */ /* Fill in the remaining client fields */
new_client->id = lm85_id++;
data->type = kind; data->type = kind;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
dev_dbg(&adapter->dev, "Assigning ID %d to %s at %d,0x%02x\n",
new_client->id, new_client->name,
i2c_adapter_id(new_client->adapter),
new_client->addr);
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client))) if ((err = i2c_attach_client(new_client)))
goto ERROR1; goto ERROR1;
......
...@@ -202,12 +202,6 @@ struct lm87_data { ...@@ -202,12 +202,6 @@ struct lm87_data {
u8 vrm; u8 vrm;
}; };
/*
* Internal variables
*/
static int lm87_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -569,7 +563,6 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -569,7 +563,6 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */ /* We can fill in the remaining client fields */
strlcpy(new_client->name, "lm87", I2C_NAME_SIZE); strlcpy(new_client->name, "lm87", I2C_NAME_SIZE);
new_client->id = lm87_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -189,12 +189,6 @@ struct lm90_data { ...@@ -189,12 +189,6 @@ struct lm90_data {
u8 alarms; /* bitvector */ u8 alarms; /* bitvector */
}; };
/*
* Internal variables
*/
static int lm90_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -427,7 +421,6 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -427,7 +421,6 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */ /* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm90_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -116,12 +116,6 @@ struct max1619_data { ...@@ -116,12 +116,6 @@ struct max1619_data {
u8 alarms; u8 alarms;
}; };
/*
* Internal variables
*/
static int max1619_id;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -267,7 +261,6 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -267,7 +261,6 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */ /* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = max1619_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -77,8 +77,6 @@ static struct i2c_driver pcf8574_driver = { ...@@ -77,8 +77,6 @@ static struct i2c_driver pcf8574_driver = {
.detach_client = pcf8574_detach_client, .detach_client = pcf8574_detach_client,
}; };
static int pcf8574_id;
/* following are the sysfs callback functions */ /* following are the sysfs callback functions */
static ssize_t show_read(struct device *dev, char *buf) static ssize_t show_read(struct device *dev, char *buf)
{ {
...@@ -159,8 +157,6 @@ int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -159,8 +157,6 @@ int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, client_name, I2C_NAME_SIZE); strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
new_client->id = pcf8574_id++;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
......
...@@ -98,8 +98,6 @@ static struct i2c_driver pcf8591_driver = { ...@@ -98,8 +98,6 @@ static struct i2c_driver pcf8591_driver = {
.detach_client = pcf8591_detach_client, .detach_client = pcf8591_detach_client,
}; };
static int pcf8591_id;
/* following are the sysfs callback functions */ /* following are the sysfs callback functions */
#define show_in_channel(channel) \ #define show_in_channel(channel) \
static ssize_t show_in##channel##_input(struct device *dev, char *buf) \ static ssize_t show_in##channel##_input(struct device *dev, char *buf) \
...@@ -201,8 +199,6 @@ int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -201,8 +199,6 @@ int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields and put it into the global /* Fill in the remaining client fields and put it into the global
list */ list */
strlcpy(new_client->name, "pcf8591", I2C_NAME_SIZE); strlcpy(new_client->name, "pcf8591", I2C_NAME_SIZE);
new_client->id = pcf8591_id++;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
......
...@@ -163,14 +163,12 @@ static int rtc8564_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -163,14 +163,12 @@ static int rtc8564_attach(struct i2c_adapter *adap, int addr, int kind)
strlcpy(new_client->name, "RTC8564", I2C_NAME_SIZE); strlcpy(new_client->name, "RTC8564", I2C_NAME_SIZE);
i2c_set_clientdata(new_client, d); i2c_set_clientdata(new_client, d);
new_client->id = rtc8564_driver.id;
new_client->flags = I2C_CLIENT_ALLOW_USE | I2C_DF_NOTIFY; new_client->flags = I2C_CLIENT_ALLOW_USE | I2C_DF_NOTIFY;
new_client->addr = addr; new_client->addr = addr;
new_client->adapter = adap; new_client->adapter = adap;
new_client->driver = &rtc8564_driver; new_client->driver = &rtc8564_driver;
_DBG(1, "client=%p", new_client); _DBG(1, "client=%p", new_client);
_DBG(1, "client.id=%d", new_client->id);
/* init ctrl1 reg */ /* init ctrl1 reg */
data[0] = 0; data[0] = 0;
......
...@@ -108,7 +108,6 @@ superio_exit(void) ...@@ -108,7 +108,6 @@ superio_exit(void)
struct smsc47m1_data { struct smsc47m1_data {
struct i2c_client client; struct i2c_client client;
struct semaphore lock; struct semaphore lock;
int sysctl_id;
struct semaphore update_lock; struct semaphore update_lock;
unsigned long last_updated; /* In jiffies */ unsigned long last_updated; /* In jiffies */
...@@ -133,8 +132,6 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev, ...@@ -133,8 +132,6 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
int init); int init);
static int smsc47m1_id;
static struct i2c_driver smsc47m1_driver = { static struct i2c_driver smsc47m1_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "smsc47m1", .name = "smsc47m1",
...@@ -420,8 +417,6 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -420,8 +417,6 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
new_client->flags = 0; new_client->flags = 0;
strlcpy(new_client->name, "smsc47m1", I2C_NAME_SIZE); strlcpy(new_client->name, "smsc47m1", I2C_NAME_SIZE);
new_client->id = smsc47m1_id++;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
/* If no function is properly configured, there's no point in /* If no function is properly configured, there's no point in
......
...@@ -113,12 +113,6 @@ struct w83l785ts_data { ...@@ -113,12 +113,6 @@ struct w83l785ts_data {
u8 temp, temp_over; u8 temp, temp_over;
}; };
/*
* Internal variables
*/
static int w83l785ts_id = 0;
/* /*
* Sysfs stuff * Sysfs stuff
*/ */
...@@ -229,7 +223,6 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -229,7 +223,6 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields. */ /* We can fill in the remaining client fields. */
strlcpy(new_client->name, "w83l785ts", I2C_NAME_SIZE); strlcpy(new_client->name, "w83l785ts", I2C_NAME_SIZE);
new_client->id = w83l785ts_id++;
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment