diff for duplicates of <53FBF09F.8050502@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index 754a37d..2d6b35b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On 08/25/2014 08:23 PM, Mikko Perttunen 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. Thanks. @@ -13,7 +13,7 @@ Wei. > 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. @@ -21,8 +21,8 @@ Wei. >> 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 >> ++++++++++++++++++++++++++++++++++----------------- @@ -47,7 +47,7 @@ Wei. >> 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) @@ -76,10 +76,10 @@ Wei. >> 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 @@ -87,8 +87,8 @@ Wei. >> + 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); @@ -128,15 +128,15 @@ Wei. >> - 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 @@ -182,15 +182,14 @@ Wei. >> - 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 @@ -198,8 +197,8 @@ Wei. >> + 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); @@ -213,8 +212,7 @@ Wei. >> 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)); >> +} @@ -228,8 +226,7 @@ Wei. >> { 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; @@ -242,7 +239,7 @@ Wei. >> - 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, @@ -287,8 +284,7 @@ Wei. >> *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; @@ -306,3 +302,9 @@ Wei. >> } >> >> + + +_______________________________________________ +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 4486e47..848f1c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,9 +2,9 @@ "ref\01408948188-4181-2-git-send-email-wni@nvidia.com\0" "ref\053FB2AAA.30601@nvidia.com\0" "ref\053FB2AAA.30601-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@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 10:27:43 +0800\0" + "From\0Wei Ni <wni@nvidia.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 02:27:43 +0000\0" "To\0Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>" edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org @@ -19,7 +19,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" "Thanks.\n" @@ -30,7 +30,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" @@ -38,8 +38,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" @@ -64,7 +64,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" @@ -93,10 +93,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" @@ -104,8 +104,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" @@ -145,15 +145,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" @@ -199,15 +199,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" @@ -215,8 +214,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" @@ -230,8 +229,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" @@ -245,8 +243,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" @@ -259,7 +256,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" @@ -304,8 +301,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" @@ -322,6 +318,12 @@ ">> return 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 -1b4e7baa75b2e8cd3741d412a7c6202fd71c412e3aea7faf5a95695583458593 +c006a5372e20c55c6dfb0c47e88c354f96998a0986950e62f3e5078d221db45e
diff --git a/a/1.txt b/N2/1.txt index 754a37d..ae86ebe 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On 08/25/2014 08:23 PM, Mikko Perttunen 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. Thanks. @@ -13,7 +13,7 @@ Wei. > 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. @@ -21,8 +21,8 @@ Wei. >> 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 4486e47..ec6b4a4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,24 @@ "ref\01408948188-4181-1-git-send-email-wni@nvidia.com\0" "ref\01408948188-4181-2-git-send-email-wni@nvidia.com\0" "ref\053FB2AAA.30601@nvidia.com\0" - "ref\053FB2AAA.30601-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 v3 1/4] hwmon: (lm90) split set&show temp as common codes\0" "Date\0Tue, 26 Aug 2014 10:27:43 +0800\0" - "To\0Mikko Perttunen <mperttunen-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\0Mikko Perttunen <mperttunen@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" "On 08/25/2014 08:23 PM, Mikko Perttunen wrote:\n" "> 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" "Thanks.\n" @@ -30,7 +29,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" @@ -38,8 +37,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" @@ -324,4 +323,4 @@ ">>\n" >> -1b4e7baa75b2e8cd3741d412a7c6202fd71c412e3aea7faf5a95695583458593 +a776a3cecedf9ad364ff85ea0341e9da62d58f61c0bc1e394272bc534fc190de
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.