diff for duplicates of <5200D354.2080102@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index 37f0053..59f20d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ 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 @@ -14,7 +14,7 @@ On 08/06/2013 06:36 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(-) @@ -35,7 +35,7 @@ On 08/06/2013 06:36 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) @@ -68,10 +68,10 @@ On 08/06/2013 06:36 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 @@ -79,8 +79,8 @@ On 08/06/2013 06:36 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); @@ -117,15 +117,15 @@ On 08/06/2013 06:36 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 @@ -173,10 +173,10 @@ On 08/06/2013 06:36 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 @@ -184,8 +184,8 @@ On 08/06/2013 06:36 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); @@ -223,7 +223,7 @@ On 08/06/2013 06:36 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 @@ -269,4 +269,10 @@ On 08/06/2013 06:36 PM, Wei Ni wrote: > return count; > } > -> +> + + +_______________________________________________ +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 e8095c6..ce7fe44 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01375785417-13650-1-git-send-email-wni@nvidia.com\0" "ref\01375785417-13650-1-git-send-email-wni-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\0Tue, 6 Aug 2013 18:43:32 +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\0Tue, 06 Aug 2013 10:43:32 +0000\0" "To\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0" "Cc\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> @@ -12,7 +12,7 @@ "\00:1\0" "b\0" "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" @@ -27,7 +27,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" @@ -48,7 +48,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" @@ -81,10 +81,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" @@ -92,8 +92,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" @@ -130,15 +130,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" @@ -186,10 +186,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" @@ -197,8 +197,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" @@ -236,7 +236,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" @@ -282,6 +282,12 @@ "> \treturn count;\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 -22bdbc1023fe7d16118f4a792de753a33a10d0f2b46dca7f2e22902d8c8d4278 +8daa7c72130b2d54d9b9868972c1eefde9e90cfd00de60cd5b25e020600eff3c
diff --git a/a/1.txt b/N2/1.txt index 37f0053..8bfe073 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ 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 @@ -14,7 +14,7 @@ On 08/06/2013 06:36 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 e8095c6..3f7960b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,18 +1,17 @@ "ref\01375785417-13650-1-git-send-email-wni@nvidia.com\0" - "ref\01375785417-13650-1-git-send-email-wni-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\0Tue, 6 Aug 2013 18:43:32 +0800\0" - "To\0khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0" - "Cc\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@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\0khali@linux-fr.org <khali@linux-fr.org>\0" + "Cc\0Wei Ni <wni@nvidia.com>" + 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" "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" @@ -27,7 +26,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" @@ -284,4 +283,4 @@ "> \n" > -22bdbc1023fe7d16118f4a792de753a33a10d0f2b46dca7f2e22902d8c8d4278 +74a4cc5ad92ad911bd8b97c0115a5f8bc576c6bf1edd61ee4199f52d56b7a1dc
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.