mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-10-28 12:40:42 +00:00
Drop unused client id.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2867 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
dc6501f36b
commit
1756f8d8dd
45 files changed
-185
No files matched your search
@@ -177,8 +177,6 @@ static ctl_table adm1021_max_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int adm1021_id = 0;
|
||||
|
||||
static int adm1021_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, adm1021_detect);
|
||||
@@ -290,8 +288,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = adm1021_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -210,8 +210,6 @@ static void adm1024_analog_out(struct i2c_client *client, int operation,
|
||||
static void adm1024_vid(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int adm1024_id = 0;
|
||||
|
||||
static struct i2c_driver adm1024_driver = {
|
||||
.name = "ADM1024 sensor driver",
|
||||
.id = I2C_DRIVERID_ADM1024,
|
||||
@@ -373,8 +371,6 @@ static int adm1024_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = adm1024_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -156,8 +156,6 @@ static void adm1025_vid(struct i2c_client *client, int operation,
|
||||
static void adm1025_vrm(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int adm1025_id = 0;
|
||||
|
||||
static struct i2c_driver adm1025_driver = {
|
||||
.name = "ADM1025 sensor driver",
|
||||
.id = I2C_DRIVERID_ADM1025,
|
||||
@@ -323,8 +321,6 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = adm1025_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -202,8 +202,6 @@ static struct i2c_driver adm1031_driver = {
|
||||
.detach_client = adm1031_detach_client,
|
||||
};
|
||||
|
||||
static int adm1031_id = 0;
|
||||
|
||||
#define TEMP_TO_REG(val) ((val) < 0 ? (((val) - 500) / 1000) : \
|
||||
(((val) + 500) / 1000))
|
||||
|
||||
@@ -285,8 +283,6 @@ adm1031_detect(struct i2c_adapter *adapter, int address,
|
||||
data->chip_type = kind;
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = adm1031_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -208,8 +208,6 @@ static void adm9240_analog_out(struct i2c_client *client, int operation,
|
||||
static void adm9240_vid(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int adm9240_id = 0;
|
||||
|
||||
static struct i2c_driver adm9240_driver = {
|
||||
.name = "ADM9240 sensor driver",
|
||||
.id = I2C_DRIVERID_ADM9240,
|
||||
@@ -370,8 +368,6 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = adm9240_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -467,8 +467,6 @@ static u16 registers_720_480[] =
|
||||
};
|
||||
|
||||
|
||||
int bt869_id = 0;
|
||||
|
||||
static int bt869_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, bt869_detect);
|
||||
@@ -537,8 +535,6 @@ int bt869_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = bt869_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -192,8 +192,6 @@ static ctl_table ddcmon_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int ddcmon_id = 0;
|
||||
|
||||
static int ddcmon_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, ddcmon_detect);
|
||||
@@ -259,8 +257,6 @@ int ddcmon_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it in the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = ddcmon_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -86,7 +86,6 @@ static int ds1307_attach (struct i2c_adapter *adapter,int addr,unsigned short fl
|
||||
return (-ENOMEM);
|
||||
|
||||
strcpy (client->name,ds1307.name);
|
||||
client->id = ds1307.id;
|
||||
client->flags = I2C_CLIENT_ALLOW_USE | I2C_CLIENT_ALLOW_MULTIPLE_USE;
|
||||
client->addr = addr;
|
||||
client->adapter = adapter;
|
||||
|
||||
@@ -153,8 +153,6 @@ static ctl_table ds1621_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int ds1621_id = 0;
|
||||
|
||||
static int ds1621_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, ds1621_detect);
|
||||
@@ -241,8 +239,6 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = ds1621_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -160,8 +160,6 @@ static void fscher_volt(struct i2c_client *client, int operation,
|
||||
static void fscher_wdog(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int fscher_id = 0;
|
||||
|
||||
static struct i2c_driver fscher_driver = {
|
||||
.name = "FSCHER sensor driver",
|
||||
.id = I2C_DRIVERID_FSCHER,
|
||||
@@ -296,8 +294,6 @@ int fscher_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the
|
||||
global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = fscher_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -159,8 +159,6 @@ static void fscpos_volt(struct i2c_client *client, int operation,
|
||||
static void fscpos_wdog(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int fscpos_id = 0;
|
||||
|
||||
static struct i2c_driver fscpos_driver = {
|
||||
.name = "FSCPOS sensor driver",
|
||||
.id = I2C_DRIVERID_FSCPOS,
|
||||
@@ -279,8 +277,6 @@ int fscpos_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = fscpos_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -217,8 +217,6 @@ static void fscscy_pciload(struct i2c_client *client, int operation,
|
||||
static void fscscy_intrusion(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int fscscy_id = 0;
|
||||
|
||||
static struct i2c_driver fscscy_driver = {
|
||||
.name = "FSCSCY sensor driver",
|
||||
.id = I2C_DRIVERID_FSCSCY,
|
||||
@@ -358,8 +356,6 @@ int fscscy_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = fscscy_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -345,7 +345,6 @@ static int gl518_detect(struct i2c_adapter *adapter, int address,
|
||||
goto ERROR2;
|
||||
}
|
||||
gl518_list[i] = new_client;
|
||||
new_client->id = i;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -245,8 +245,6 @@ static ctl_table gl520_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int gl520_id = 0;
|
||||
|
||||
static int gl520_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, gl520_detect);
|
||||
@@ -319,8 +317,6 @@ static int gl520_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = gl520_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -104,7 +104,6 @@ static ctl_table icspll_dir_table_template[] = {
|
||||
/* holding place for data - block read could be as much as 32 */
|
||||
static u8 tempdata[MAXBLOCK_SIZE];
|
||||
|
||||
static int icspll_id = 0;
|
||||
static int icspll_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, icspll_detect);
|
||||
@@ -141,7 +140,6 @@ int icspll_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill the new client structure with data */
|
||||
new_client = &data->client;
|
||||
new_client->data = data;
|
||||
new_client->id = icspll_id++;
|
||||
new_client->addr = address;
|
||||
new_client->adapter = adapter;
|
||||
new_client->driver = &icspll_driver;
|
||||
|
||||
@@ -94,8 +94,6 @@ static ctl_table lm75_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int lm75_id = 0;
|
||||
|
||||
static int lm75_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, lm75_detect);
|
||||
@@ -192,8 +190,6 @@ int lm75_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = lm75_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -174,8 +174,6 @@ static struct i2c_driver lm78_driver = {
|
||||
.detach_client = lm78_detach_client,
|
||||
};
|
||||
|
||||
static int lm78_id = 0;
|
||||
|
||||
/* The /proc/sys entries */
|
||||
|
||||
/* -- SENSORS SYSCTL START -- */
|
||||
@@ -379,8 +377,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = lm78_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -154,8 +154,6 @@ static void lm80_alarms(struct i2c_client *client, int operation,
|
||||
static void lm80_fan_div(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int lm80_id = 0;
|
||||
|
||||
static struct i2c_driver lm80_driver = {
|
||||
.name = "LM80 sensor driver",
|
||||
.id = I2C_DRIVERID_LM80,
|
||||
@@ -302,8 +300,6 @@ int lm80_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = lm80_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -200,12 +200,6 @@ static ctl_table lm83_dir_table_template[] =
|
||||
{0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Internal variables
|
||||
*/
|
||||
|
||||
static int lm83_id = 0;
|
||||
|
||||
/*
|
||||
* Real code
|
||||
*/
|
||||
@@ -333,7 +327,6 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, unsigned
|
||||
*/
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
new_client->id = lm83_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -250,8 +250,6 @@ static void lm87_vid(struct i2c_client *client, int operation,
|
||||
static void lm87_vrm(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int lm87_id = 0;
|
||||
|
||||
static struct i2c_driver LM87_driver = {
|
||||
.name = "LM87 sensor driver",
|
||||
.id = I2C_DRIVERID_LM87,
|
||||
@@ -426,8 +424,6 @@ static int lm87_detect(struct i2c_adapter *adapter, int address,
|
||||
client_name = "LM87 chip";
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = lm87_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -252,12 +252,6 @@ static ctl_table lm90_dir_table_template[] =
|
||||
{0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Internal variables
|
||||
*/
|
||||
|
||||
static int lm90_id = 0;
|
||||
|
||||
/*
|
||||
* Real code
|
||||
*/
|
||||
@@ -434,7 +428,6 @@ static int lm90_detect(struct i2c_adapter *adapter, int address,
|
||||
*/
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
new_client->id = lm90_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -299,7 +299,6 @@ static int lm92_init_client (struct i2c_client *client)
|
||||
|
||||
static int lm92_detect (struct i2c_adapter *adapter,int address,unsigned short flags,int kind)
|
||||
{
|
||||
static int id = 0;
|
||||
struct i2c_client *client;
|
||||
lm92_t *data;
|
||||
int result = 0;
|
||||
@@ -350,8 +349,6 @@ static int lm92_detect (struct i2c_adapter *adapter,int address,unsigned short f
|
||||
goto ERROR4;
|
||||
}
|
||||
|
||||
client->id = id++;
|
||||
|
||||
up (&mutex);
|
||||
|
||||
return (0);
|
||||
|
||||
@@ -119,8 +119,6 @@ static ctl_table ltc1710_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int ltc1710_id = 0;
|
||||
|
||||
static int ltc1710_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, ltc1710_detect);
|
||||
@@ -184,8 +182,6 @@ int ltc1710_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = ltc1710_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -91,8 +91,6 @@ static ctl_table matorb_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int matorb_id = 0;
|
||||
|
||||
static int matorb_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, matorb_detect);
|
||||
@@ -146,8 +144,6 @@ int matorb_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = matorb_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -160,12 +160,6 @@ static ctl_table max1619_dir_table_template[] =
|
||||
{0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Internal variables
|
||||
*/
|
||||
|
||||
static int max1619_id = 0;
|
||||
|
||||
/*
|
||||
* Real code
|
||||
*/
|
||||
@@ -287,7 +281,6 @@ static int max1619_detect(struct i2c_adapter *adapter, int address,
|
||||
*/
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
new_client->id = max1619_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -176,12 +176,6 @@ static ctl_table max6650_dir_table_template[] =
|
||||
{0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Internal variables
|
||||
*/
|
||||
|
||||
static int max6650_id = 0;
|
||||
|
||||
/*
|
||||
* Real code
|
||||
*/
|
||||
@@ -292,7 +286,6 @@ static int max6650_detect(struct i2c_adapter *adapter, int address, unsigned
|
||||
*/
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
new_client->id = max6650_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -312,8 +312,6 @@ static struct i2c_driver maxi_driver = {
|
||||
.detach_client = maxi_detach_client,
|
||||
};
|
||||
|
||||
static int maxi_id = 0;
|
||||
|
||||
/* Default firmware version. Use module option "maxi_version"
|
||||
to set desired version. Auto detect is not yet working */
|
||||
static int maxi_version = cristal;
|
||||
@@ -601,8 +599,6 @@ int maxi_detect(struct i2c_adapter *adapter, int address,
|
||||
((struct maxi_data *) (new_client->data))->
|
||||
lcd[i][j] = (u8) 0;
|
||||
|
||||
new_client->id = maxi_id++;
|
||||
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -252,8 +252,6 @@ static void mtp008_sens(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
static void mtp008_getsensortype(struct mtp008_data *data, u8 inp);
|
||||
|
||||
static int mtp008_id = 0;
|
||||
|
||||
static struct i2c_driver mtp008_driver =
|
||||
{
|
||||
.name = "MTP008 sensor driver",
|
||||
@@ -428,8 +426,6 @@ int mtp008_detect(struct i2c_adapter *adapter, int address,
|
||||
client_name = "MTP008 chip";
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = mtp008_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -266,8 +266,6 @@ void pc87365_temp(struct i2c_client *client, int operation, int ctl_name,
|
||||
void pc87365_temp_status(struct i2c_client *client, int operation, int ctl_name,
|
||||
int *nrels_mag, long *results);
|
||||
|
||||
static int pc87360_id = 0;
|
||||
|
||||
static struct i2c_driver pc87360_driver = {
|
||||
.name = "PC8736x hardware monitor",
|
||||
.flags = I2C_DF_NOTIFY,
|
||||
@@ -639,8 +637,6 @@ int pc87360_detect(struct i2c_adapter *adapter, int address,
|
||||
}
|
||||
}
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = pc87360_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -86,8 +86,6 @@ static ctl_table pca9540_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int pca9540_id = 0;
|
||||
|
||||
static int pca9540_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, pca9540_detect);
|
||||
@@ -133,7 +131,6 @@ int pca9540_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, "PCA9540 chip");
|
||||
new_client->id = pca9540_id++;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
/* Tell the I2C layer a new client has arrived */
|
||||
|
||||
@@ -114,8 +114,6 @@ static ctl_table pcf8574_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int pcf8574_id = 0;
|
||||
|
||||
static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, pcf8574_detect);
|
||||
@@ -179,8 +177,6 @@ int pcf8574_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = pcf8574_id++;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
/* Tell the I2C layer a new client has arrived */
|
||||
|
||||
@@ -109,8 +109,6 @@ static struct i2c_driver pcf8591_driver = {
|
||||
.detach_client = pcf8591_detach_client,
|
||||
};
|
||||
|
||||
static int pcf8591_id = 0;
|
||||
|
||||
/* The /proc/sys entries */
|
||||
|
||||
/* -- SENSORS SYSCTL START -- */
|
||||
@@ -207,8 +205,6 @@ int pcf8591_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = pcf8591_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -183,8 +183,6 @@ static ctl_table saa1064_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int saa1064_id = 0;
|
||||
|
||||
static int saa1064_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, saa1064_detect);
|
||||
@@ -245,8 +243,6 @@ static int saa1064_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = saa1064_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -218,8 +218,6 @@ static void sis5595_alarms(struct i2c_client *client, int operation,
|
||||
static void sis5595_fan_div(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int sis5595_id = 0;
|
||||
|
||||
/* The driver. I choose to use type i2c_driver, as at is identical to both
|
||||
smbus_driver and isa_driver, and clients could be of either kind */
|
||||
static struct i2c_driver sis5595_driver = {
|
||||
@@ -417,8 +415,6 @@ int sis5595_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = sis5595_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -210,8 +210,6 @@ static ctl_table smartbatt_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int smartbatt_id = 0;
|
||||
|
||||
static int smartbatt_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, smartbatt_detect);
|
||||
@@ -268,8 +266,6 @@ int smartbatt_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = smartbatt_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -166,8 +166,6 @@ static ctl_table smbusarp_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int smbusarp_id = 0;
|
||||
|
||||
static int smbusarp_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, smbusarp_detect);
|
||||
@@ -209,8 +207,6 @@ int smbusarp_detect(struct i2c_adapter *adapter, int address,
|
||||
client_name = "SMBUS ARP client";
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = smbusarp_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -160,8 +160,6 @@ static void smsc47m1_fan_div(struct i2c_client *client, int operation,
|
||||
static void smsc47m1_pwm(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int smsc47m1_id = 0;
|
||||
|
||||
static struct i2c_driver smsc47m1_driver = {
|
||||
.name = "SMSC 47M1xx fan monitor",
|
||||
.id = I2C_DRIVERID_SMSC47M1,
|
||||
@@ -274,8 +272,6 @@ int smsc47m1_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
request_region(address, SMSC_EXTENT, "smsc47m1-fans");
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = smsc47m1_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -152,8 +152,6 @@ static ctl_table thmc50_dir_table_template[] = {
|
||||
};
|
||||
|
||||
|
||||
static int thmc50_id = 0;
|
||||
|
||||
static int thmc50_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, thmc50_detect);
|
||||
@@ -231,8 +229,6 @@ int thmc50_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = thmc50_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -357,8 +357,6 @@ static void via686a_alarms(struct i2c_client *client, int operation,
|
||||
static void via686a_fan_div(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int via686a_id = 0;
|
||||
|
||||
/* The driver. I choose to use type i2c_driver, as at is identical to both
|
||||
smbus_driver and isa_driver, and clients could be of either kind */
|
||||
static struct i2c_driver via686a_driver = {
|
||||
@@ -512,8 +510,6 @@ int via686a_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put into the global list */
|
||||
strcpy(new_client->name, "Via 686A Integrated Sensors");
|
||||
|
||||
new_client->id = via686a_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -232,8 +232,6 @@ static void vt1211_uch(struct i2c_client *client, int operation,
|
||||
static void vt1211_temp(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int vt1211_id = 0;
|
||||
|
||||
static struct i2c_driver vt1211_driver = {
|
||||
.name = "VT1211 sensors driver",
|
||||
.id = I2C_DRIVERID_VT1211,
|
||||
@@ -423,8 +421,6 @@ int vt1211_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
request_region(address, VT1211_EXTENT, "vt1211-sensors");
|
||||
strcpy(new_client->name, client_name);
|
||||
|
||||
new_client->id = vt1211_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -191,8 +191,6 @@ static void vt8231_uch(struct i2c_client *client, int operation,
|
||||
static void vt8231_temp(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int vt8231_id = 0;
|
||||
|
||||
static struct i2c_driver vt8231_driver = {
|
||||
.name = "VT8231 sensors driver",
|
||||
.id = I2C_DRIVERID_VT8231,
|
||||
@@ -391,8 +389,6 @@ int vt8231_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Fill in the remaining client fields and put into the global list */
|
||||
strcpy(new_client->name, "Via 8231 Integrated Sensors");
|
||||
|
||||
new_client->id = vt8231_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -356,8 +356,6 @@ static void w83627hf_pwm(struct i2c_client *client, int operation,
|
||||
static void w83627hf_sens(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
|
||||
static int w83627hf_id = 0;
|
||||
|
||||
static struct i2c_driver w83627hf_driver = {
|
||||
.name = "W83627HF sensor driver",
|
||||
.id = I2C_DRIVERID_W83627HF,
|
||||
@@ -700,7 +698,6 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
new_client->id = w83627hf_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -325,8 +325,6 @@ static void w83781d_rt(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
#endif
|
||||
|
||||
static int w83781d_id = 0;
|
||||
|
||||
static struct i2c_driver w83781d_driver = {
|
||||
.name = "W83781D sensor driver",
|
||||
.id = I2C_DRIVERID_W83781D,
|
||||
@@ -938,8 +936,6 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = w83781d_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
@@ -1007,7 +1003,6 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address,
|
||||
data->lm75[i].driver = &w83781d_driver;
|
||||
data->lm75[i].flags = 0;
|
||||
strcpy(data->lm75[i].name, client_name);
|
||||
data->lm75[i].id = w83781d_id++;
|
||||
if ((err = i2c_attach_client(&(data->lm75[i])))) {
|
||||
printk(KERN_ERR "w83781d.o: Subclient %d registration at address 0x%x failed.\n",
|
||||
i, data->lm75[i].addr);
|
||||
|
||||
@@ -138,12 +138,6 @@ static ctl_table w83l785ts_dir_table_template[] =
|
||||
{0}
|
||||
};
|
||||
|
||||
/*
|
||||
* Internal variables
|
||||
*/
|
||||
|
||||
static int w83l785ts_id = 0;
|
||||
|
||||
/*
|
||||
* Real code
|
||||
*/
|
||||
@@ -250,7 +244,6 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address,
|
||||
*/
|
||||
|
||||
strcpy(new_client->name, client_name);
|
||||
new_client->id = w83l785ts_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
@@ -143,8 +143,6 @@ static ctl_table xeontemp_dir_table_template[] = {
|
||||
{0}
|
||||
};
|
||||
|
||||
static int xeontemp_id = 0;
|
||||
|
||||
static int xeontemp_attach_adapter(struct i2c_adapter *adapter)
|
||||
{
|
||||
return i2c_detect(adapter, &addr_data, xeontemp_detect);
|
||||
@@ -200,8 +198,6 @@ static int xeontemp_detect(struct i2c_adapter *adapter, int address,
|
||||
/* Fill in the remaining client fields and put it into the global list */
|
||||
strcpy(new_client->name, client_name);
|
||||
data->type = kind;
|
||||
|
||||
new_client->id = xeontemp_id++;
|
||||
data->valid = 0;
|
||||
init_MUTEX(&data->update_lock);
|
||||
|
||||
|
||||
Reference in new issue
Block a user