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

Commit 8f74efe8 authored by Jean Delvare's avatar Jean Delvare Committed by Mark M. Hoffman
Browse files

hwmon: VRM is not written to registers 



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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 345a2224

drivers/hwmon/adm1025.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

		       const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct adm1025_data *data = i2c_get_clientdata(client);

	struct adm1025_data *data = dev_get_drvdata(dev);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

drivers/hwmon/asb100.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct asb100_data *data = i2c_get_clientdata(client);

	unsigned long val = simple_strtoul(buf, NULL, 10);

	data->vrm = val;

	struct asb100_data *data = dev_get_drvdata(dev);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

drivers/hwmon/lm85.c

+2 −6
Original line number Diff line number Diff line
@@ -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)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct lm85_data *data = i2c_get_clientdata(client);

	u32 val;



	val = simple_strtoul(buf, NULL, 10);

	data->vrm = val;

	struct lm85_data *data = dev_get_drvdata(dev);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

drivers/hwmon/lm87.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct lm87_data *data = i2c_get_clientdata(client);

	struct lm87_data *data = dev_get_drvdata(dev);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

drivers/hwmon/smsc47m192.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

		const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct smsc47m192_data *data = i2c_get_clientdata(client);

	struct smsc47m192_data *data = dev_get_drvdata(dev);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}