forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hwmon: VRM is not written to registers

Browse source 
What was true of reading the VRM value is also true of writing it: not
being a register value, it doesn't need hardware access, so we don't
need a reference to the i2c client. This allows for a minor code
cleanup. As gcc appears to be smart enough to simplify the generated
code by itself, this cleanup only affects the source code, the
generated binaries are unchanged.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
Jean Delvare 2007-12-01 11:25:33 +01:00 • committed by Mark M. Hoffman
parent 345a222454
commit 8f74efe81d
7 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/hwmon/adm1025.c
View file

@ -334,8 +334,7 @@ show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct adm1025_data *data = dev_get_drvdata(dev);
struct adm1025_data *data = i2c_get_clientdata(client);
data->vrm = simple_strtoul(buf, NULL, 10); data->vrm = simple_strtoul(buf, NULL, 10);
return count; return count;
} }

6
drivers/hwmon/asb100.c
View file

@ -519,10 +519,8 @@ static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char
static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct asb100_data *data = dev_get_drvdata(dev);
struct asb100_data *data = i2c_get_clientdata(client); data->vrm = simple_strtoul(buf, NULL, 10);
unsigned long val = simple_strtoul(buf, NULL, 10);
data->vrm = val;
return count; return count;
} }

8
drivers/hwmon/lm85.c
View file

@ -443,12 +443,8 @@ static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, c
static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct lm85_data *data = dev_get_drvdata(dev);
struct lm85_data *data = i2c_get_clientdata(client); data->vrm = simple_strtoul(buf, NULL, 10);
u32 val;
val = simple_strtoul(buf, NULL, 10);
data->vrm = val;
return count; return count;
} }

3
drivers/hwmon/lm87.c
View file

@ -510,8 +510,7 @@ static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char
} }
static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct lm87_data *data = dev_get_drvdata(dev);
struct lm87_data *data = i2c_get_clientdata(client);
data->vrm = simple_strtoul(buf, NULL, 10); data->vrm = simple_strtoul(buf, NULL, 10);
return count; return count;
} }

3
drivers/hwmon/smsc47m192.c
View file

@ -341,8 +341,7 @@ static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct smsc47m192_data *data = dev_get_drvdata(dev);
struct smsc47m192_data *data = i2c_get_clientdata(client);
data->vrm = simple_strtoul(buf, NULL, 10); data->vrm = simple_strtoul(buf, NULL, 10);
return count; return count;
} }

6
drivers/hwmon/w83791d.c
View file

@ -840,14 +840,12 @@ static ssize_t store_vrm_reg(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83791d_data *data = dev_get_drvdata(dev);
struct w83791d_data *data = i2c_get_clientdata(client);
unsigned long val = simple_strtoul(buf, NULL, 10);
/* No lock needed as vrm is internal to the driver /* No lock needed as vrm is internal to the driver
(not read from a chip register) and so is not (not read from a chip register) and so is not
updated in w83791d_update_device() */ updated in w83791d_update_device() */
data->vrm = val; data->vrm = simple_strtoul(buf, NULL, 10);
return count; return count;
} }

8
drivers/hwmon/w83793.c
View file

@ -243,9 +243,7 @@ static struct i2c_driver w83793_driver = {
static ssize_t static ssize_t
show_vrm(struct device *dev, struct device_attribute *attr, char *buf) show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83793_data *data = dev_get_drvdata(dev);
struct w83793_data *data = i2c_get_clientdata(client);
return sprintf(buf, "%d\n", data->vrm); return sprintf(buf, "%d\n", data->vrm);
} }
@ -264,9 +262,7 @@ static ssize_t
store_vrm(struct device *dev, struct device_attribute *attr, store_vrm(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83793_data *data = dev_get_drvdata(dev);
struct w83793_data *data = i2c_get_clientdata(client);
data->vrm = simple_strtoul(buf, NULL, 10); data->vrm = simple_strtoul(buf, NULL, 10);
return count; return count;
} }