diff for duplicates of <522D6773.2090608@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index f224e27..dbd7a6c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ Wei. On 08/06/2013 06:43 PM, Wei Ni wrote: > This patch is separated from my previous v3 series, which is in -> http://www.mail-archive.com/linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg466772.html +> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg466772.html > > Changes from v3: > 1. Add error handler for lm90_select_remote_channel(), set_temp8(), and @@ -21,7 +21,7 @@ On 08/06/2013 06:43 PM, 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: Wei Ni <wni@nvidia.com> >> --- >> drivers/hwmon/lm90.c | 150 +++++++++++++++++++++++++++++++++----------------- >> 1 file changed, 99 insertions(+), 51 deletions(-) @@ -42,7 +42,7 @@ On 08/06/2013 06:43 PM, 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) @@ -75,10 +75,10 @@ On 08/06/2013 06:43 PM, Wei Ni wrote: >> struct lm90_data *data = lm90_update_device(dev); >> int temp; >> ->> if (data->kind == adt7461) +>> 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) +>> else if (data->kind = max6646) >> - temp = temp_from_u8(data->temp8[attr->index]); >> + temp = temp_from_u8(data->temp8[index]); >> else @@ -86,8 +86,8 @@ On 08/06/2013 06:43 PM, 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); @@ -124,15 +124,15 @@ On 08/06/2013 06:43 PM, 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) +>> 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) +>> else if (data->kind = max6646) >> - data->temp8[nr] = temp_to_u8(val); >> + data->temp8[index] = temp_to_u8(val); >> else @@ -180,10 +180,10 @@ On 08/06/2013 06:43 PM, Wei Ni wrote: >> struct lm90_data *data = lm90_update_device(dev); >> int temp; >> ->> if (data->kind == adt7461) +>> 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) +>> else if (data->kind = max6646) >> - temp = temp_from_u16(data->temp11[attr->index]); >> + temp = temp_from_u16(data->temp11[index]); >> else @@ -191,8 +191,8 @@ On 08/06/2013 06:43 PM, 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); @@ -230,7 +230,7 @@ On 08/06/2013 06:43 PM, 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; >> @@ -830,15 +855,38 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, >> else @@ -277,4 +277,10 @@ On 08/06/2013 06:43 PM, 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 6be5259..73a929d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01375785417-13650-1-git-send-email-wni@nvidia.com\0" "ref\05200D354.2080102@nvidia.com\0" "ref\05200D354.2080102-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH RESEND v4] hwmon: (lm90) split set&show temp as common codes\0" - "Date\0Mon, 9 Sep 2013 14:15:15 +0800\0" + "From\0Wei Ni <wni@nvidia.com>\0" + "Subject\0Re: [lm-sensors] [PATCH RESEND v4] hwmon: (lm90) split set&show temp as common codes\0" + "Date\0Mon, 09 Sep 2013 06:15:15 +0000\0" "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>" linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> @@ -20,7 +20,7 @@ "\n" "On 08/06/2013 06:43 PM, Wei Ni wrote:\n" "> This patch is separated from my previous v3 series, which is in\n" - "> http://www.mail-archive.com/linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg466772.html\n" + "> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg466772.html\n" "> \n" "> Changes from v3:\n" "> 1. Add error handler for lm90_select_remote_channel(), set_temp8(), and\n" @@ -35,7 +35,7 @@ ">> 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: Wei Ni <wni@nvidia.com>\n" ">> ---\n" ">> drivers/hwmon/lm90.c | 150 +++++++++++++++++++++++++++++++++-----------------\n" ">> 1 file changed, 99 insertions(+), 51 deletions(-)\n" @@ -56,7 +56,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" @@ -89,10 +89,10 @@ ">> \tstruct lm90_data *data = lm90_update_device(dev);\n" ">> \tint temp;\n" ">> \n" - ">> \tif (data->kind == adt7461)\n" + ">> \tif (data->kind = adt7461)\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" @@ -100,8 +100,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" @@ -138,15 +138,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)\n" + ">> \tif (data->kind = adt7461)\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" @@ -194,10 +194,10 @@ ">> \tstruct lm90_data *data = lm90_update_device(dev);\n" ">> \tint temp;\n" ">> \n" - ">> \tif (data->kind == adt7461)\n" + ">> \tif (data->kind = adt7461)\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" @@ -205,8 +205,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" @@ -244,7 +244,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" ">> @@ -830,15 +855,38 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,\n" ">> \telse\n" @@ -291,6 +291,12 @@ ">> }\n" ">> \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 -63e84e730263bc4240441bb1bbef321558c5d8c050dd5548289726892d9c8cac +80b32c9b2897a8158af2b7e35dfebebdb7758fa4644fba713d7317d76afbea13
diff --git a/a/1.txt b/N2/1.txt index f224e27..33113a2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,7 @@ Wei. On 08/06/2013 06:43 PM, Wei Ni wrote: > This patch is separated from my previous v3 series, which is in -> http://www.mail-archive.com/linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg466772.html +> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg466772.html > > Changes from v3: > 1. Add error handler for lm90_select_remote_channel(), set_temp8(), and @@ -21,7 +21,7 @@ On 08/06/2013 06:43 PM, 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: Wei Ni <wni@nvidia.com> >> --- >> drivers/hwmon/lm90.c | 150 +++++++++++++++++++++++++++++++++----------------- >> 1 file changed, 99 insertions(+), 51 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 6be5259..3f76ecd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,14 @@ "ref\01375785417-13650-1-git-send-email-wni@nvidia.com\0" "ref\05200D354.2080102@nvidia.com\0" - "ref\05200D354.2080102-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "From\0Wei Ni <wni@nvidia.com>\0" "Subject\0Re: [PATCH RESEND v4] hwmon: (lm90) split set&show temp as common codes\0" "Date\0Mon, 9 Sep 2013 14:15:15 +0800\0" - "To\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>" - linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> - lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - " linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0Wei Ni <wni@nvidia.com>\0" + "Cc\0khali@linux-fr.org <khali@linux-fr.org>" + linux@roeck-us.net <linux@roeck-us.net> + lm-sensors@lm-sensors.org <lm-sensors@lm-sensors.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + " linux-tegra@vger.kernel.org <linux-tegra@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi, Jean\n" @@ -20,7 +19,7 @@ "\n" "On 08/06/2013 06:43 PM, Wei Ni wrote:\n" "> This patch is separated from my previous v3 series, which is in\n" - "> http://www.mail-archive.com/linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg466772.html\n" + "> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg466772.html\n" "> \n" "> Changes from v3:\n" "> 1. Add error handler for lm90_select_remote_channel(), set_temp8(), and\n" @@ -35,7 +34,7 @@ ">> 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: Wei Ni <wni@nvidia.com>\n" ">> ---\n" ">> drivers/hwmon/lm90.c | 150 +++++++++++++++++++++++++++++++++-----------------\n" ">> 1 file changed, 99 insertions(+), 51 deletions(-)\n" @@ -293,4 +292,4 @@ ">>\n" > -63e84e730263bc4240441bb1bbef321558c5d8c050dd5548289726892d9c8cac +5cdd793e9934b8f57ced2c622e71c7ead37996db5099ac07d3dd20249c6cdd64
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.