diff for duplicates of <53FB2AAA.30601@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index c3fb6ac..ac8eae7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ Cheers, 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. @@ -12,8 +12,8 @@ On 25/08/14 09:29, Wei Ni wrote: > 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 ++++++++++++++++++++++++++++++++++----------------- > 1 file changed, 109 insertions(+), 55 deletions(-) @@ -36,7 +36,7 @@ On 25/08/14 09:29, Wei Ni wrote: > 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) @@ -63,10 +63,10 @@ On 25/08/14 09:29, Wei Ni wrote: > 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 @@ -74,8 +74,8 @@ On 25/08/14 09:29, Wei Ni wrote: > + 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); @@ -112,15 +112,15 @@ On 25/08/14 09:29, Wei Ni wrote: > - 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 @@ -168,10 +168,10 @@ On 25/08/14 09:29, Wei Ni wrote: > 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 @@ -179,8 +179,8 @@ On 25/08/14 09:29, Wei Ni wrote: > + 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); @@ -218,7 +218,7 @@ On 25/08/14 09:29, Wei Ni wrote: > - 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, > else @@ -279,3 +279,8 @@ On 25/08/14 09:29, Wei Ni wrote: > } > > + +_______________________________________________ +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 341f0ec..dc808d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01408948188-4181-1-git-send-email-wni@nvidia.com\0" "ref\01408948188-4181-2-git-send-email-wni@nvidia.com\0" "ref\01408948188-4181-2-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" - "Date\0Mon, 25 Aug 2014 15:23:06 +0300\0" + "From\0Mikko Perttunen <mperttunen@nvidia.com>\0" + "Subject\0Re: [lm-sensors] [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" + "Date\0Mon, 25 Aug 2014 12:23:06 +0000\0" "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org @@ -20,7 +20,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" @@ -28,8 +28,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" "> 1 file changed, 109 insertions(+), 55 deletions(-)\n" @@ -52,7 +52,7 @@ "> \tu8 config;\n" "> +\tint err = 0;\n" ">\n" - "> \tif (data->kind == max6696) {\n" + "> \tif (data->kind = max6696) {\n" "> \t\tlm90_read_reg(client, LM90_REG_R_CONFIG1, &config);\n" "> \t\tconfig &= ~0x08;\n" "> \t\tif (channel)\n" @@ -79,10 +79,10 @@ "> \tstruct lm90_data *data = lm90_update_device(dev);\n" "> \tint temp;\n" ">\n" - "> \tif (data->kind == adt7461 || data->kind == tmp451)\n" + "> \tif (data->kind = adt7461 || data->kind = tmp451)\n" "> -\t\ttemp = temp_from_u8_adt7461(data, data->temp8[attr->index]);\n" "> +\t\ttemp = temp_from_u8_adt7461(data, data->temp8[index]);\n" - "> \telse if (data->kind == max6646)\n" + "> \telse if (data->kind = max6646)\n" "> -\t\ttemp = temp_from_u8(data->temp8[attr->index]);\n" "> +\t\ttemp = temp_from_u8(data->temp8[index]);\n" "> \telse\n" @@ -90,8 +90,8 @@ "> +\t\ttemp = temp_from_s8(data->temp8[index]);\n" ">\n" "> \t/* +16 degrees offset for temp2 for the LM99 */\n" - "> -\tif (data->kind == lm99 && attr->index == 3)\n" - "> +\tif (data->kind == lm99 && index == 3)\n" + "> -\tif (data->kind = lm99 && attr->index = 3)\n" + "> +\tif (data->kind = lm99 && index = 3)\n" "> \t\ttemp += 16000;\n" ">\n" "> -\treturn sprintf(buf, \"%d\\n\", temp);\n" @@ -128,15 +128,15 @@ "> -\t\treturn err;\n" "> -\n" "> \t/* +16 degrees offset for temp2 for the LM99 */\n" - "> -\tif (data->kind == lm99 && attr->index == 3)\n" - "> +\tif (data->kind == lm99 && index == 3)\n" + "> -\tif (data->kind = lm99 && attr->index = 3)\n" + "> +\tif (data->kind = lm99 && index = 3)\n" "> \t\tval -= 16000;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" - "> \tif (data->kind == adt7461 || data->kind == tmp451)\n" + "> \tif (data->kind = adt7461 || data->kind = tmp451)\n" "> -\t\tdata->temp8[nr] = temp_to_u8_adt7461(data, val);\n" "> +\t\tdata->temp8[index] = temp_to_u8_adt7461(data, val);\n" - "> \telse if (data->kind == max6646)\n" + "> \telse if (data->kind = max6646)\n" "> -\t\tdata->temp8[nr] = temp_to_u8(val);\n" "> +\t\tdata->temp8[index] = temp_to_u8(val);\n" "> \telse\n" @@ -184,10 +184,10 @@ "> \tstruct lm90_data *data = lm90_update_device(dev);\n" "> \tint temp;\n" ">\n" - "> \tif (data->kind == adt7461 || data->kind == tmp451)\n" + "> \tif (data->kind = adt7461 || data->kind = tmp451)\n" "> -\t\ttemp = temp_from_u16_adt7461(data, data->temp11[attr->index]);\n" "> +\t\ttemp = temp_from_u16_adt7461(data, data->temp11[index]);\n" - "> \telse if (data->kind == max6646)\n" + "> \telse if (data->kind = max6646)\n" "> -\t\ttemp = temp_from_u16(data->temp11[attr->index]);\n" "> +\t\ttemp = temp_from_u16(data->temp11[index]);\n" "> \telse\n" @@ -195,8 +195,8 @@ "> +\t\ttemp = temp_from_s16(data->temp11[index]);\n" ">\n" "> \t/* +16 degrees offset for temp2 for the LM99 */\n" - "> -\tif (data->kind == lm99 && attr->index <= 2)\n" - "> +\tif (data->kind == lm99 && index <= 2)\n" + "> -\tif (data->kind = lm99 && attr->index <= 2)\n" + "> +\tif (data->kind = lm99 && index <= 2)\n" "> \t\ttemp += 16000;\n" ">\n" "> -\treturn sprintf(buf, \"%d\\n\", temp);\n" @@ -234,7 +234,7 @@ "> -\t\treturn err;\n" "> -\n" "> \t/* +16 degrees offset for temp2 for the LM99 */\n" - "> \tif (data->kind == lm99 && index <= 2)\n" + "> \tif (data->kind = lm99 && index <= 2)\n" "> \t\tval -= 16000;\n" "> @@ -887,15 +906,50 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,\n" "> \telse\n" @@ -294,6 +294,11 @@ "> \treturn count;\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 -0730c3bf58b6e12380383eb19fc67d9f58fb074c2db856fcfbd527cd44e59971 +5777bf7a97064f8ac860cda119a3fa5fd07c15e943eb19580182b4da5ca10171
diff --git a/a/1.txt b/N2/1.txt index c3fb6ac..1dbd922 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,7 +4,7 @@ Cheers, 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. @@ -12,8 +12,8 @@ On 25/08/14 09:29, Wei Ni wrote: > 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 ++++++++++++++++++++++++++++++++++----------------- > 1 file changed, 109 insertions(+), 55 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 341f0ec..e2a588b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,16 @@ "ref\01408948188-4181-1-git-send-email-wni@nvidia.com\0" "ref\01408948188-4181-2-git-send-email-wni@nvidia.com\0" - "ref\01408948188-4181-2-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "From\0Mikko Perttunen <mperttunen@nvidia.com>\0" "Subject\0Re: [PATCH v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" "Date\0Mon, 25 Aug 2014 15:23:06 +0300\0" - "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" - edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org - khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org - linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org - " swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org\0" - "Cc\0lm-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>" + <edubezval@gmail.com> + <khali@linux-fr.org> + <linux@roeck-us.net> + " <swarren@wwwdotorg.org>\0" + "Cc\0<lm-sensors@lm-sensors.org>" + <linux-tegra@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "FWIW, please fix the authorship information for next version.\n" @@ -20,7 +19,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" @@ -28,8 +27,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" "> 1 file changed, 109 insertions(+), 55 deletions(-)\n" @@ -296,4 +295,4 @@ ">\n" > -0730c3bf58b6e12380383eb19fc67d9f58fb074c2db856fcfbd527cd44e59971 +0e2a5c973aa9e892ef727688e9bd073fc64bd82e8159c28bf67489ef3e1b5090
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.