From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Ni Subject: Re: [lm-sensors] [RFC PATCH 2/9] hwmon: (lm90) split set&show temp as common codes Date: Tue, 19 Feb 2013 18:00:57 +0800 Message-ID: <51234D59.4060405@nvidia.com> References: <1361187031-3679-1-git-send-email-wni@nvidia.com> <1361187031-3679-3-git-send-email-wni@nvidia.com> <20130219033144.GA25610@roeck-us.net> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130219033144.GA25610-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Guenter Roeck Cc: "durgadoss.r-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org" , "rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org" , Matthew Longnecker , "khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org" , "linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" , "lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org" , "linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: devicetree@vger.kernel.org On 02/19/2013 11:31 AM, Guenter Roeck wrote: > On Mon, Feb 18, 2013 at 07:30:24PM +0800, Wei Ni wrote: >> Split set&show temp codes as common functions, so we can use it directly when >> implement linux thermal framework. >> >> Signed-off-by: Wei Ni >> --- >> drivers/hwmon/lm90.c | 117 +++++++++++++++++++++++++++++++------------------- >> 1 file changed, 72 insertions(+), 45 deletions(-) >> >> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c >> index 863412a..caf01b0 100644 >> --- a/drivers/hwmon/lm90.c >> +++ b/drivers/hwmon/lm90.c >> @@ -702,29 +702,35 @@ static u16 temp_to_u16_adt7461(struct lm90_data *data, long val) >> * Sysfs stuff >> */ >> >> -static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr, >> - char *buf) >> +static void _show_temp8(struct device *dev, int index, int *temp) > > Why do the new functions not simply return the value ? > Void return and returning the value in a pointer doesn't make much sense to me. Yes, you are right, it's better to return value simply. I will change it in my next version. Wei. > > Guenter > >> { >> - struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); >> struct lm90_data *data = lm90_update_device(dev); >> - int temp; >> >> if (data->kind == adt7461) >> - temp = temp_from_u8_adt7461(data, data->temp8[attr->index]); >> + *temp = temp_from_u8_adt7461(data, data->temp8[index]); >> else if (data->kind == max6646) >> - temp = temp_from_u8(data->temp8[attr->index]); >> + *temp = temp_from_u8(data->temp8[index]); >> else >> - temp = temp_from_s8(data->temp8[attr->index]); >> + *temp = temp_from_s8(data->temp8[index]); >> >> /* +16 degrees offset for temp2 for the LM99 */ >> - if (data->kind == lm99 && attr->index == 3) >> - temp += 16000; >> + if (data->kind == lm99 && index == 3) >> + *temp += 16000; >> + >> +} >> + >> +static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr, >> + char *buf) >> +{ >> + struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); >> + int temp; >> + >> + _show_temp8(dev, attr->index, &temp); >> >> return sprintf(buf, "%d\n", temp); >> } >> >> -static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr, >> - const char *buf, size_t count) >> +static void _set_temp8(struct device *dev, int index, long val) >> { >> static const u8 reg[8] = { >> LM90_REG_W_LOCAL_LOW, >> @@ -737,60 +743,73 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr, >> MAX6659_REG_W_REMOTE_EMERG, >> }; >> >> - struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); >> struct i2c_client *client = to_i2c_client(dev); >> struct lm90_data *data = i2c_get_clientdata(client); >> - int nr = attr->index; >> - long val; >> - int err; >> - >> - err = kstrtol(buf, 10, &val); >> - if (err < 0) >> - return err; >> >> /* +16 degrees offset for temp2 for the LM99 */ >> - if (data->kind == lm99 && attr->index == 3) >> + if (data->kind == lm99 && index == 3) >> val -= 16000; >> >> mutex_lock(&data->update_lock); >> if (data->kind == adt7461) >> - data->temp8[nr] = temp_to_u8_adt7461(data, val); >> + data->temp8[index] = temp_to_u8_adt7461(data, val); >> else if (data->kind == max6646) >> - data->temp8[nr] = temp_to_u8(val); >> + data->temp8[index] = temp_to_u8(val); >> else >> - data->temp8[nr] = temp_to_s8(val); >> + data->temp8[index] = temp_to_s8(val); >> >> - lm90_select_remote_channel(client, data, nr >= 6); >> - i2c_smbus_write_byte_data(client, reg[nr], data->temp8[nr]); >> + lm90_select_remote_channel(client, data, index >= 6); >> + i2c_smbus_write_byte_data(client, reg[index], data->temp8[index]); >> lm90_select_remote_channel(client, data, 0); >> >> mutex_unlock(&data->update_lock); >> +} >> + >> +static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr, >> + const char *buf, size_t count) >> +{ >> + struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); >> + int index = attr->index; >> + long val; >> + int err; >> + >> + err = kstrtol(buf, 10, &val); >> + if (err < 0) >> + return err; >> + >> + _set_temp8(dev, index, val); >> + >> return count; >> } >> >> -static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr, >> - char *buf) >> +static void _show_temp11(struct device *dev, int index, int *temp) >> { >> - struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); >> struct lm90_data *data = lm90_update_device(dev); >> - int temp; >> >> if (data->kind == adt7461) >> - temp = temp_from_u16_adt7461(data, data->temp11[attr->index]); >> + *temp = temp_from_u16_adt7461(data, data->temp11[index]); >> else if (data->kind == max6646) >> - temp = temp_from_u16(data->temp11[attr->index]); >> + *temp = temp_from_u16(data->temp11[index]); >> else >> - temp = temp_from_s16(data->temp11[attr->index]); >> + *temp = temp_from_s16(data->temp11[index]); >> >> /* +16 degrees offset for temp2 for the LM99 */ >> - if (data->kind == lm99 && attr->index <= 2) >> - temp += 16000; >> + if (data->kind == lm99 && index <= 2) >> + *temp += 16000; >> +} >> + >> +static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr, >> + char *buf) >> +{ >> + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); >> + int temp; >> + >> + _show_temp11(dev, attr->index, &temp); >> >> return sprintf(buf, "%d\n", temp); >> } >> >> -static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, >> - const char *buf, size_t count) >> +static void _set_temp11(struct device *dev, int nr, int index, long val) >> { >> struct { >> u8 high; >> @@ -804,17 +823,8 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, >> { LM90_REG_W_REMOTE_HIGHH, LM90_REG_W_REMOTE_HIGHL, 1 } >> }; >> >> - struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); >> struct i2c_client *client = to_i2c_client(dev); >> struct lm90_data *data = i2c_get_clientdata(client); >> - int nr = attr->nr; >> - int index = attr->index; >> - long val; >> - int err; >> - >> - err = kstrtol(buf, 10, &val); >> - if (err < 0) >> - return err; >> >> /* +16 degrees offset for temp2 for the LM99 */ >> if (data->kind == lm99 && index <= 2) >> @@ -839,6 +849,23 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, >> lm90_select_remote_channel(client, data, 0); >> >> mutex_unlock(&data->update_lock); >> +} >> + >> +static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, >> + const char *buf, size_t count) >> +{ >> + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); >> + int nr = attr->nr; >> + int index = attr->index; >> + long val; >> + int err; >> + >> + err = kstrtol(buf, 10, &val); >> + if (err < 0) >> + return err; >> + >> + _set_temp11(dev, nr, index, val); >> + >> return count; >> } >> >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> lm-sensors mailing list >> lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org >> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors >>