| Message ID | 1361187031-3679-3-git-send-email-wni@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei, This set of patches seems to include 3 logical subsets 1) lm90 changes 2) dt support in drivers/thermal 3) tegra30 support in drivers/thermal Would it make sense to split this into 3 separate sets of changes? -Matt Longnecker nvpublic
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 <wni@nvidia.com> > --- > 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. 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@lm-sensors.org > http://lists.lm-sensors.org/mailman/listinfo/lm-sensors >
On 02/19/2013 06:29 AM, Matthew Longnecker wrote: > Wei, > > This set of patches seems to include 3 logical subsets > 1) lm90 changes > 2) dt support in drivers/thermal > 3) tegra30 support in drivers/thermal > > Would it make sense to split this into 3 separate sets of changes? Ok, I will do it in my next version. > > -Matt Longnecker > > nvpublic >
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 <wni@nvidia.com> >> --- >> 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@lm-sensors.org >> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors >>
On 02/18/2013 04:30 AM, Wei Ni wrote: > Split set&show temp codes as common functions, so we can use it directly when > implement linux thermal framework. > diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c > -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) This function now seems to be "get" not "show". If you rename it to e.g. "get_temp8", then you won't need to use an _ in the function name. If that name causes conflicts with later patches, perhaps "read_temp8". > -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) Similarly, perhaps "write_temp8"? Similar comments for the rest of the patch.
On 02/20/2013 06:56 AM, Stephen Warren wrote: > On 02/18/2013 04:30 AM, Wei Ni wrote: >> Split set&show temp codes as common functions, so we can use it directly when >> implement linux thermal framework. > >> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c > >> -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) > > This function now seems to be "get" not "show". If you rename it to e.g. > "get_temp8", then you won't need to use an _ in the function name. If > that name causes conflicts with later patches, perhaps "read_temp8". Yes, it looks "read_" is better. I will change it. > >> -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) > > Similarly, perhaps "write_temp8"? > > Similar comments for the rest of the patch. >
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) { - 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; }
Split set&show temp codes as common functions, so we can use it directly when implement linux thermal framework. Signed-off-by: Wei Ni <wni@nvidia.com> --- drivers/hwmon/lm90.c | 117 +++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 45 deletions(-)