diff for duplicates of <20140826121729.GC15219@developer> diff --git a/a/1.txt b/N1/1.txt index 382bcce..76bad36 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Tue, Aug 26, 2014 at 10:27:43AM +0800, Wei Ni wrote: > > FWIW, please fix the authorship information for next version. > > Sorry, I didn't get your point, did you mean I should remove the line -> "From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" ? Yes I made a mistake on it, I +> "From: lightning314 <wni@nvidia.com>" ? Yes I made a mistake on it, I > will remove it in next version. No Wei, don't remove the author line. Well, based on email, it is your @@ -22,7 +22,7 @@ You must use real names there, such as "Wei Ni". > > Mikko > > > > On 25/08/14 09:29, Wei Ni wrote: -> >> From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +> >> From: lightning314 <wni@nvidia.com> > >> > >> Split set&show temp codes as common functions, so we can use it > >> directly when implement linux thermal framework. @@ -30,8 +30,8 @@ You must use real names there, such as "Wei Ni". > >> and write_tempx, then set_temp8 and set_temp11 could return it > >> to user-space. > >> -> >> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> -> >> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> +> >> Signed-off-by: Wei Ni <wni@nvidia.com> +> >> Signed-off-by: Jean Delvare <khali@linux-fr.org> > >> --- > >> drivers/hwmon/lm90.c | 164 > >> ++++++++++++++++++++++++++++++++++----------------- @@ -56,7 +56,7 @@ You must use real names there, such as "Wei Ni". > >> u8 config; > >> + int err = 0; > >> -> >> if (data->kind == max6696) { +> >> if (data->kind = max6696) { > >> lm90_read_reg(client, LM90_REG_R_CONFIG1, &config); > >> config &= ~0x08; > >> if (channel) @@ -85,10 +85,10 @@ You must use real names there, such as "Wei Ni". > >> struct lm90_data *data = lm90_update_device(dev); > >> int temp; > >> -> >> if (data->kind == adt7461 || data->kind == tmp451) +> >> if (data->kind = adt7461 || data->kind = tmp451) > >> - temp = temp_from_u8_adt7461(data, data->temp8[attr->index]); > >> + temp = temp_from_u8_adt7461(data, data->temp8[index]); -> >> else if (data->kind == max6646) +> >> else if (data->kind = max6646) > >> - temp = temp_from_u8(data->temp8[attr->index]); > >> + temp = temp_from_u8(data->temp8[index]); > >> else @@ -96,8 +96,8 @@ You must use real names there, such as "Wei Ni". > >> + temp = temp_from_s8(data->temp8[index]); > >> > >> /* +16 degrees offset for temp2 for the LM99 */ -> >> - if (data->kind == lm99 && attr->index == 3) -> >> + if (data->kind == lm99 && index == 3) +> >> - if (data->kind = lm99 && attr->index = 3) +> >> + if (data->kind = lm99 && index = 3) > >> temp += 16000; > >> > >> - return sprintf(buf, "%d\n", temp); @@ -137,15 +137,15 @@ You must use real names there, such as "Wei Ni". > >> - return err; > >> - > >> /* +16 degrees offset for temp2 for the LM99 */ -> >> - if (data->kind == lm99 && attr->index == 3) -> >> + if (data->kind == lm99 && index == 3) +> >> - 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->kind == tmp451) +> >> if (data->kind = adt7461 || data->kind = tmp451) > >> - data->temp8[nr] = temp_to_u8_adt7461(data, val); > >> + data->temp8[index] = temp_to_u8_adt7461(data, val); -> >> else if (data->kind == max6646) +> >> else if (data->kind = max6646) > >> - data->temp8[nr] = temp_to_u8(val); > >> + data->temp8[index] = temp_to_u8(val); > >> else @@ -191,15 +191,14 @@ You must use real names there, such as "Wei Ni". > >> - char *buf) > >> +static int read_temp11(struct device *dev, int index) > >> { -> >> - struct sensor_device_attribute_2 *attr = -> >> to_sensor_dev_attr_2(devattr); +> >> - 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 || data->kind == tmp451) +> >> if (data->kind = adt7461 || data->kind = tmp451) > >> - temp = temp_from_u16_adt7461(data, data->temp11[attr->index]); > >> + temp = temp_from_u16_adt7461(data, data->temp11[index]); -> >> else if (data->kind == max6646) +> >> else if (data->kind = max6646) > >> - temp = temp_from_u16(data->temp11[attr->index]); > >> + temp = temp_from_u16(data->temp11[index]); > >> else @@ -207,8 +206,8 @@ You must use real names there, such as "Wei Ni". > >> + temp = temp_from_s16(data->temp11[index]); > >> > >> /* +16 degrees offset for temp2 for the LM99 */ -> >> - if (data->kind == lm99 && attr->index <= 2) -> >> + if (data->kind == lm99 && index <= 2) +> >> - if (data->kind = lm99 && attr->index <= 2) +> >> + if (data->kind = lm99 && index <= 2) > >> temp += 16000; > >> > >> - return sprintf(buf, "%d\n", temp); @@ -222,8 +221,7 @@ You must use real names there, such as "Wei Ni". > >> device_attribute *devattr, > >> + char *buf) > >> +{ -> >> + struct sensor_device_attribute_2 *attr = -> >> to_sensor_dev_attr_2(devattr); +> >> + struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr); > >> + > >> + return sprintf(buf, "%d\n", read_temp11(dev, attr->index)); > >> +} @@ -237,8 +235,7 @@ You must use real names there, such as "Wei Ni". > >> { LM90_REG_W_REMOTE_HIGHH, LM90_REG_W_REMOTE_HIGHL, 1 } > >> }; > >> -> >> - struct sensor_device_attribute_2 *attr = -> >> to_sensor_dev_attr_2(devattr); +> >> - struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr); > >> struct lm90_data *data = dev_get_drvdata(dev); > >> struct i2c_client *client = data->client; > >> - int nr = attr->nr; @@ -251,7 +248,7 @@ You must use real names there, such as "Wei Ni". > >> - return err; > >> - > >> /* +16 degrees offset for temp2 for the LM99 */ -> >> if (data->kind == lm99 && index <= 2) +> >> if (data->kind = lm99 && index <= 2) > >> val -= 16000; > >> @@ -887,15 +906,50 @@ static ssize_t set_temp11(struct device *dev, > >> struct device_attribute *devattr, @@ -296,8 +293,7 @@ You must use real names there, such as "Wei Ni". > >> *devattr, > >> + const char *buf, size_t count) > >> +{ -> >> + struct sensor_device_attribute_2 *attr = -> >> to_sensor_dev_attr_2(devattr); +> >> + struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr); > >> + int nr = attr->nr; > >> + int index = attr->index; > >> + long val; @@ -315,4 +311,9 @@ You must use real names there, such as "Wei Ni". > >> } > >> > >> -> +> + +_______________________________________________ +lm-sensors mailing list +lm-sensors@lm-sensors.org +http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 525acf8..dd470c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "ref\053FB2AAA.30601@nvidia.com\0" "ref\053FBF09F.8050502@nvidia.com\0" "ref\053FBF09F.8050502-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" - "Date\0Tue, 26 Aug 2014 08:17:31 -0400\0" + "From\0Eduardo Valentin <edubezval@gmail.com>\0" + "Subject\0Re: [lm-sensors] [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" + "Date\0Tue, 26 Aug 2014 12:17:31 +0000\0" "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" "Cc\0Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org @@ -21,7 +21,7 @@ "> > FWIW, please fix the authorship information for next version.\n" "> \n" "> Sorry, I didn't get your point, did you mean I should remove the line\n" - "> \"From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\" ? Yes I made a mistake on it, I\n" + "> \"From: lightning314 <wni@nvidia.com>\" ? Yes I made a mistake on it, I\n" "> will remove it in next version.\n" "\n" "No Wei, don't remove the author line. Well, based on email, it is your\n" @@ -40,7 +40,7 @@ "> > Mikko\n" "> > \n" "> > On 25/08/14 09:29, Wei Ni wrote:\n" - "> >> From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "> >> From: lightning314 <wni@nvidia.com>\n" "> >>\n" "> >> Split set&show temp codes as common functions, so we can use it\n" "> >> directly when implement linux thermal framework.\n" @@ -48,8 +48,8 @@ "> >> and write_tempx, then set_temp8 and set_temp11 could return it\n" "> >> to user-space.\n" "> >>\n" - "> >> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" - "> >> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n" + "> >> Signed-off-by: Wei Ni <wni@nvidia.com>\n" + "> >> Signed-off-by: Jean Delvare <khali@linux-fr.org>\n" "> >> ---\n" "> >> drivers/hwmon/lm90.c | 164\n" "> >> ++++++++++++++++++++++++++++++++++-----------------\n" @@ -74,7 +74,7 @@ "> >> u8 config;\n" "> >> + int err = 0;\n" "> >>\n" - "> >> if (data->kind == max6696) {\n" + "> >> if (data->kind = max6696) {\n" "> >> lm90_read_reg(client, LM90_REG_R_CONFIG1, &config);\n" "> >> config &= ~0x08;\n" "> >> if (channel)\n" @@ -103,10 +103,10 @@ "> >> struct lm90_data *data = lm90_update_device(dev);\n" "> >> int temp;\n" "> >>\n" - "> >> if (data->kind == adt7461 || data->kind == tmp451)\n" + "> >> if (data->kind = adt7461 || data->kind = tmp451)\n" "> >> - temp = temp_from_u8_adt7461(data, data->temp8[attr->index]);\n" "> >> + temp = temp_from_u8_adt7461(data, data->temp8[index]);\n" - "> >> else if (data->kind == max6646)\n" + "> >> else if (data->kind = max6646)\n" "> >> - temp = temp_from_u8(data->temp8[attr->index]);\n" "> >> + temp = temp_from_u8(data->temp8[index]);\n" "> >> else\n" @@ -114,8 +114,8 @@ "> >> + temp = temp_from_s8(data->temp8[index]);\n" "> >>\n" "> >> /* +16 degrees offset for temp2 for the LM99 */\n" - "> >> - if (data->kind == lm99 && attr->index == 3)\n" - "> >> + if (data->kind == lm99 && index == 3)\n" + "> >> - if (data->kind = lm99 && attr->index = 3)\n" + "> >> + if (data->kind = lm99 && index = 3)\n" "> >> temp += 16000;\n" "> >>\n" "> >> - return sprintf(buf, \"%d\\n\", temp);\n" @@ -155,15 +155,15 @@ "> >> - return err;\n" "> >> -\n" "> >> /* +16 degrees offset for temp2 for the LM99 */\n" - "> >> - if (data->kind == lm99 && attr->index == 3)\n" - "> >> + if (data->kind == lm99 && index == 3)\n" + "> >> - if (data->kind = lm99 && attr->index = 3)\n" + "> >> + if (data->kind = lm99 && index = 3)\n" "> >> val -= 16000;\n" "> >>\n" "> >> mutex_lock(&data->update_lock);\n" - "> >> if (data->kind == adt7461 || data->kind == tmp451)\n" + "> >> if (data->kind = adt7461 || data->kind = tmp451)\n" "> >> - data->temp8[nr] = temp_to_u8_adt7461(data, val);\n" "> >> + data->temp8[index] = temp_to_u8_adt7461(data, val);\n" - "> >> else if (data->kind == max6646)\n" + "> >> else if (data->kind = max6646)\n" "> >> - data->temp8[nr] = temp_to_u8(val);\n" "> >> + data->temp8[index] = temp_to_u8(val);\n" "> >> else\n" @@ -209,15 +209,14 @@ "> >> - char *buf)\n" "> >> +static int read_temp11(struct device *dev, int index)\n" "> >> {\n" - "> >> - struct sensor_device_attribute_2 *attr =\n" - "> >> to_sensor_dev_attr_2(devattr);\n" + "> >> - struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr);\n" "> >> struct lm90_data *data = lm90_update_device(dev);\n" "> >> int temp;\n" "> >>\n" - "> >> if (data->kind == adt7461 || data->kind == tmp451)\n" + "> >> if (data->kind = adt7461 || data->kind = tmp451)\n" "> >> - temp = temp_from_u16_adt7461(data, data->temp11[attr->index]);\n" "> >> + temp = temp_from_u16_adt7461(data, data->temp11[index]);\n" - "> >> else if (data->kind == max6646)\n" + "> >> else if (data->kind = max6646)\n" "> >> - temp = temp_from_u16(data->temp11[attr->index]);\n" "> >> + temp = temp_from_u16(data->temp11[index]);\n" "> >> else\n" @@ -225,8 +224,8 @@ "> >> + temp = temp_from_s16(data->temp11[index]);\n" "> >>\n" "> >> /* +16 degrees offset for temp2 for the LM99 */\n" - "> >> - if (data->kind == lm99 && attr->index <= 2)\n" - "> >> + if (data->kind == lm99 && index <= 2)\n" + "> >> - if (data->kind = lm99 && attr->index <= 2)\n" + "> >> + if (data->kind = lm99 && index <= 2)\n" "> >> temp += 16000;\n" "> >>\n" "> >> - return sprintf(buf, \"%d\\n\", temp);\n" @@ -240,8 +239,7 @@ "> >> device_attribute *devattr,\n" "> >> + char *buf)\n" "> >> +{\n" - "> >> + struct sensor_device_attribute_2 *attr =\n" - "> >> to_sensor_dev_attr_2(devattr);\n" + "> >> + struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr);\n" "> >> +\n" "> >> + return sprintf(buf, \"%d\\n\", read_temp11(dev, attr->index));\n" "> >> +}\n" @@ -255,8 +253,7 @@ "> >> { LM90_REG_W_REMOTE_HIGHH, LM90_REG_W_REMOTE_HIGHL, 1 }\n" "> >> };\n" "> >>\n" - "> >> - struct sensor_device_attribute_2 *attr =\n" - "> >> to_sensor_dev_attr_2(devattr);\n" + "> >> - struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr);\n" "> >> struct lm90_data *data = dev_get_drvdata(dev);\n" "> >> struct i2c_client *client = data->client;\n" "> >> - int nr = attr->nr;\n" @@ -269,7 +266,7 @@ "> >> - return err;\n" "> >> -\n" "> >> /* +16 degrees offset for temp2 for the LM99 */\n" - "> >> if (data->kind == lm99 && index <= 2)\n" + "> >> if (data->kind = lm99 && index <= 2)\n" "> >> val -= 16000;\n" "> >> @@ -887,15 +906,50 @@ static ssize_t set_temp11(struct device *dev,\n" "> >> struct device_attribute *devattr,\n" @@ -314,8 +311,7 @@ "> >> *devattr,\n" "> >> + const char *buf, size_t count)\n" "> >> +{\n" - "> >> + struct sensor_device_attribute_2 *attr =\n" - "> >> to_sensor_dev_attr_2(devattr);\n" + "> >> + struct sensor_device_attribute_2 *attr > >> to_sensor_dev_attr_2(devattr);\n" "> >> + int nr = attr->nr;\n" "> >> + int index = attr->index;\n" "> >> + long val;\n" @@ -333,6 +329,11 @@ "> >> }\n" "> >>\n" "> >>\n" - > + "> \n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -c9b93e3689beece71b9ce7adfd0d3af19c5c4d9e4667dfd5b33e2fcae0e97161 +76ed9e5204e5b4740172bde1765d41e28cb16e51b9318d10ca5a65fcc1543393
diff --git a/a/1.txt b/N2/1.txt index 382bcce..47a0225 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ On Tue, Aug 26, 2014 at 10:27:43AM +0800, Wei Ni wrote: > > FWIW, please fix the authorship information for next version. > > Sorry, I didn't get your point, did you mean I should remove the line -> "From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" ? Yes I made a mistake on it, I +> "From: lightning314 <wni@nvidia.com>" ? Yes I made a mistake on it, I > will remove it in next version. No Wei, don't remove the author line. Well, based on email, it is your @@ -22,7 +22,7 @@ You must use real names there, such as "Wei Ni". > > Mikko > > > > On 25/08/14 09:29, Wei Ni wrote: -> >> From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +> >> From: lightning314 <wni@nvidia.com> > >> > >> Split set&show temp codes as common functions, so we can use it > >> directly when implement linux thermal framework. @@ -30,8 +30,8 @@ You must use real names there, such as "Wei Ni". > >> and write_tempx, then set_temp8 and set_temp11 could return it > >> to user-space. > >> -> >> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> -> >> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> +> >> Signed-off-by: Wei Ni <wni@nvidia.com> +> >> Signed-off-by: Jean Delvare <khali@linux-fr.org> > >> --- > >> drivers/hwmon/lm90.c | 164 > >> ++++++++++++++++++++++++++++++++++----------------- diff --git a/a/content_digest b/N2/content_digest index 525acf8..8c7a17e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,18 +2,17 @@ "ref\01408948188-4181-2-git-send-email-wni@nvidia.com\0" "ref\053FB2AAA.30601@nvidia.com\0" "ref\053FBF09F.8050502@nvidia.com\0" - "ref\053FBF09F.8050502-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "From\0Eduardo Valentin <edubezval@gmail.com>\0" "Subject\0Re: [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" "Date\0Tue, 26 Aug 2014 08:17:31 -0400\0" - "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" - khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org - linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org - swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org - lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org - linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Wei Ni <wni@nvidia.com>\0" + "Cc\0Mikko Perttunen <mperttunen@nvidia.com>" + khali@linux-fr.org + linux@roeck-us.net + swarren@wwwdotorg.org + lm-sensors@lm-sensors.org + linux-tegra@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Aug 26, 2014 at 10:27:43AM +0800, Wei Ni wrote:\n" @@ -21,7 +20,7 @@ "> > FWIW, please fix the authorship information for next version.\n" "> \n" "> Sorry, I didn't get your point, did you mean I should remove the line\n" - "> \"From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\" ? Yes I made a mistake on it, I\n" + "> \"From: lightning314 <wni@nvidia.com>\" ? Yes I made a mistake on it, I\n" "> will remove it in next version.\n" "\n" "No Wei, don't remove the author line. Well, based on email, it is your\n" @@ -40,7 +39,7 @@ "> > Mikko\n" "> > \n" "> > On 25/08/14 09:29, Wei Ni wrote:\n" - "> >> From: lightning314 <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "> >> From: lightning314 <wni@nvidia.com>\n" "> >>\n" "> >> Split set&show temp codes as common functions, so we can use it\n" "> >> directly when implement linux thermal framework.\n" @@ -48,8 +47,8 @@ "> >> and write_tempx, then set_temp8 and set_temp11 could return it\n" "> >> to user-space.\n" "> >>\n" - "> >> Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" - "> >> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n" + "> >> Signed-off-by: Wei Ni <wni@nvidia.com>\n" + "> >> Signed-off-by: Jean Delvare <khali@linux-fr.org>\n" "> >> ---\n" "> >> drivers/hwmon/lm90.c | 164\n" "> >> ++++++++++++++++++++++++++++++++++-----------------\n" @@ -335,4 +334,4 @@ "> >>\n" > -c9b93e3689beece71b9ce7adfd0d3af19c5c4d9e4667dfd5b33e2fcae0e97161 +03d351bc534031b5603a8c61547263f5bbc4fae426053417e56e0fb555644634
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.