diff for duplicates of <20110226024552.GA14032@ericsson.com> diff --git a/a/1.txt b/N1/1.txt index e33e107..25404ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -263,7 +263,7 @@ not have to clean it up. > > + > > + mutex_lock(&pmbus_list_mutex); > > + list_for_each_entry(p, &pmbus_list, list) { -> > + if (p->client = client) { +> > + if (p->client == client) { > > + list_del(&p->list); > > + kfree(p); > > + break; @@ -1074,7 +1074,7 @@ This one isn't strictly needed, though, so I removed it. > > + s16 exponent, mantissa; > > + long val; > > + -> > + if (sensor->class = PSC_VOLTAGE_OUT) { +> > + if (sensor->class == PSC_VOLTAGE_OUT) { > > + exponent = data->exponent; > > + mantissa = (s16) sensor->data; > > + } else { @@ -1094,7 +1094,7 @@ This one isn't strictly needed, though, so I removed it. > > + val = val * 1000L; > > + > > + /* scale result to micro-units for power sensors */ -> > + if (sensor->class = PSC_POWER) +> > + if (sensor->class == PSC_POWER) > > + val = val * 1000L; > > + > > + if (exponent >= 0) @@ -1119,7 +1119,7 @@ This one isn't strictly needed, though, so I removed it. > > + b = data->info->b[sensor->class]; > > + R = data->info->R[sensor->class]; > > + -> > + if (m = 0) +> > + if (m == 0) > > + return 0; > > + > > + /* X = 1/m * (Y * 10^-R - b) */ @@ -1131,7 +1131,7 @@ This one isn't strictly needed, though, so I removed it. > > + } > > + > > + /* scale result to micro-units for power sensors */ -> > + if (sensor->class = PSC_POWER) { +> > + if (sensor->class == PSC_POWER) { > > + R += 3; > > + b *= 1000; > > + } @@ -1170,7 +1170,7 @@ This one isn't strictly needed, though, so I removed it. > > + bool negative = false; > > + > > + /* simple case */ -> > + if (val = 0) +> > + if (val == 0) > > + return 0; > > + > > + if (val < 0) { @@ -1178,7 +1178,7 @@ This one isn't strictly needed, though, so I removed it. > > + val = -val; > > + } > > + -> > + if (class = PSC_VOLTAGE_OUT) { +> > + if (class == PSC_VOLTAGE_OUT) { > > + /* > > + * For a static exponents, we don't have a choice > > + * but to adjust the value to it. @@ -1194,14 +1194,14 @@ This one isn't strictly needed, though, so I removed it. > > + } > > + > > + /* Power is in uW. Convert to mW before converting. */ -> > + if (class = PSC_POWER) +> > + if (class == PSC_POWER) > > + val = DIV_ROUND_CLOSEST(val, 1000L); > > + > > + /* > > + * For simplicity, convert fan data to milli-units > > + * before calculating the exponent. > > + */ -> > + if (class = PSC_FAN) +> > + if (class == PSC_FAN) > > + val = val * 1000; > > + > > + /* Reduce large mantissa until it fits into 10 bit */ @@ -1240,7 +1240,7 @@ This one isn't strictly needed, though, so I removed it. > > + R = data->info->R[class]; > > + > > + /* Power is in uW. Adjust R and b. */ -> > + if (class = PSC_POWER) { +> > + if (class == PSC_POWER) { > > + R -= 3; > > + b *= 1000; > > + } @@ -1567,10 +1567,12 @@ yes > > + max_labels++; > > + } > > + if (info->func[page] & PMBUS_HAVE_FAN12) { -> > + if (page = 0) { -> > + max_sensors +> > + ARRAY_SIZE(pmbus_fan_registers) * +> > + if (page == 0) { +> > + max_sensors += +> > + ARRAY_SIZE(pmbus_fan_registers) * > > + PMBUS_MAX_SENSORS_PER_FAN; -> > + max_booleans +> > + ARRAY_SIZE(pmbus_fan_registers) * +> > + max_booleans += +> > + ARRAY_SIZE(pmbus_fan_registers) * > > + PMBUS_MAX_BOOLEANS_PER_FAN; > > + } else { > > + max_sensors += PMBUS_MAX_SENSORS_PER_FAN; @@ -1578,10 +1580,12 @@ yes > > + } > > + } > > + if (info->func[page] & PMBUS_HAVE_TEMP) { -> > + if (page = 0) { -> > + max_sensors +> > + ARRAY_SIZE(pmbus_temp_registers) * +> > + if (page == 0) { +> > + max_sensors += +> > + ARRAY_SIZE(pmbus_temp_registers) * > > + PMBUS_MAX_SENSORS_PER_TEMP; -> > + max_booleans +> > + ARRAY_SIZE(pmbus_temp_registers) * +> > + max_booleans += +> > + ARRAY_SIZE(pmbus_temp_registers) * > > + PMBUS_MAX_BOOLEANS_PER_TEMP; > > + } else { > > + max_sensors += PMBUS_MAX_SENSORS_PER_TEMP; @@ -2439,9 +2443,4 @@ I'll add some text to pmbus.h. > > +}; > > + > > +#endif /* _PMBUS_H_ */ -> - -_______________________________________________ -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 59e7fc4..02efb9b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\01297969217-9564-2-git-send-email-guenter.roeck@ericsson.com\0" "ref\04D680FAE.80600@cam.ac.uk\0" "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0" - "Subject\0Re: [lm-sensors] [PATCH v4 1/5] hwmon: PMBus device driver\0" - "Date\0Sat, 26 Feb 2011 02:45:52 +0000\0" + "Subject\0Re: [PATCH v4 1/5] hwmon: PMBus device driver\0" + "Date\0Fri, 25 Feb 2011 18:45:52 -0800\0" "To\0Jonathan Cameron <jic23@cam.ac.uk>\0" "Cc\0Jean Delvare <khali@linux-fr.org>" Jonathan Cameron <kernel@jic23.retrosnub.co.uk> @@ -279,7 +279,7 @@ "> > +\n" "> > + mutex_lock(&pmbus_list_mutex);\n" "> > + list_for_each_entry(p, &pmbus_list, list) {\n" - "> > + if (p->client = client) {\n" + "> > + if (p->client == client) {\n" "> > + list_del(&p->list);\n" "> > + kfree(p);\n" "> > + break;\n" @@ -1090,7 +1090,7 @@ "> > + s16 exponent, mantissa;\n" "> > + long val;\n" "> > +\n" - "> > + if (sensor->class = PSC_VOLTAGE_OUT) {\n" + "> > + if (sensor->class == PSC_VOLTAGE_OUT) {\n" "> > + exponent = data->exponent;\n" "> > + mantissa = (s16) sensor->data;\n" "> > + } else {\n" @@ -1110,7 +1110,7 @@ "> > + val = val * 1000L;\n" "> > +\n" "> > + /* scale result to micro-units for power sensors */\n" - "> > + if (sensor->class = PSC_POWER)\n" + "> > + if (sensor->class == PSC_POWER)\n" "> > + val = val * 1000L;\n" "> > +\n" "> > + if (exponent >= 0)\n" @@ -1135,7 +1135,7 @@ "> > + b = data->info->b[sensor->class];\n" "> > + R = data->info->R[sensor->class];\n" "> > +\n" - "> > + if (m = 0)\n" + "> > + if (m == 0)\n" "> > + return 0;\n" "> > +\n" "> > + /* X = 1/m * (Y * 10^-R - b) */\n" @@ -1147,7 +1147,7 @@ "> > + }\n" "> > +\n" "> > + /* scale result to micro-units for power sensors */\n" - "> > + if (sensor->class = PSC_POWER) {\n" + "> > + if (sensor->class == PSC_POWER) {\n" "> > + R += 3;\n" "> > + b *= 1000;\n" "> > + }\n" @@ -1186,7 +1186,7 @@ "> > + bool negative = false;\n" "> > +\n" "> > + /* simple case */\n" - "> > + if (val = 0)\n" + "> > + if (val == 0)\n" "> > + return 0;\n" "> > +\n" "> > + if (val < 0) {\n" @@ -1194,7 +1194,7 @@ "> > + val = -val;\n" "> > + }\n" "> > +\n" - "> > + if (class = PSC_VOLTAGE_OUT) {\n" + "> > + if (class == PSC_VOLTAGE_OUT) {\n" "> > + /*\n" "> > + * For a static exponents, we don't have a choice\n" "> > + * but to adjust the value to it.\n" @@ -1210,14 +1210,14 @@ "> > + }\n" "> > +\n" "> > + /* Power is in uW. Convert to mW before converting. */\n" - "> > + if (class = PSC_POWER)\n" + "> > + if (class == PSC_POWER)\n" "> > + val = DIV_ROUND_CLOSEST(val, 1000L);\n" "> > +\n" "> > + /*\n" "> > + * For simplicity, convert fan data to milli-units\n" "> > + * before calculating the exponent.\n" "> > + */\n" - "> > + if (class = PSC_FAN)\n" + "> > + if (class == PSC_FAN)\n" "> > + val = val * 1000;\n" "> > +\n" "> > + /* Reduce large mantissa until it fits into 10 bit */\n" @@ -1256,7 +1256,7 @@ "> > + R = data->info->R[class];\n" "> > +\n" "> > + /* Power is in uW. Adjust R and b. */\n" - "> > + if (class = PSC_POWER) {\n" + "> > + if (class == PSC_POWER) {\n" "> > + R -= 3;\n" "> > + b *= 1000;\n" "> > + }\n" @@ -1583,10 +1583,12 @@ "> > + max_labels++;\n" "> > + }\n" "> > + if (info->func[page] & PMBUS_HAVE_FAN12) {\n" - "> > + if (page = 0) {\n" - "> > + max_sensors +> > + ARRAY_SIZE(pmbus_fan_registers) *\n" + "> > + if (page == 0) {\n" + "> > + max_sensors +=\n" + "> > + ARRAY_SIZE(pmbus_fan_registers) *\n" "> > + PMBUS_MAX_SENSORS_PER_FAN;\n" - "> > + max_booleans +> > + ARRAY_SIZE(pmbus_fan_registers) *\n" + "> > + max_booleans +=\n" + "> > + ARRAY_SIZE(pmbus_fan_registers) *\n" "> > + PMBUS_MAX_BOOLEANS_PER_FAN;\n" "> > + } else {\n" "> > + max_sensors += PMBUS_MAX_SENSORS_PER_FAN;\n" @@ -1594,10 +1596,12 @@ "> > + }\n" "> > + }\n" "> > + if (info->func[page] & PMBUS_HAVE_TEMP) {\n" - "> > + if (page = 0) {\n" - "> > + max_sensors +> > + ARRAY_SIZE(pmbus_temp_registers) *\n" + "> > + if (page == 0) {\n" + "> > + max_sensors +=\n" + "> > + ARRAY_SIZE(pmbus_temp_registers) *\n" "> > + PMBUS_MAX_SENSORS_PER_TEMP;\n" - "> > + max_booleans +> > + ARRAY_SIZE(pmbus_temp_registers) *\n" + "> > + max_booleans +=\n" + "> > + ARRAY_SIZE(pmbus_temp_registers) *\n" "> > + PMBUS_MAX_BOOLEANS_PER_TEMP;\n" "> > + } else {\n" "> > + max_sensors += PMBUS_MAX_SENSORS_PER_TEMP;\n" @@ -2455,11 +2459,6 @@ "> > +};\n" "> > +\n" "> > +#endif /* _PMBUS_H_ */\n" - "> \n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + > -e89cebaf82f03f4b02d82dc1539fce31cc93f5b0588b0f5c754a611a0ffb7089 +ed4c3af09e5d181ed9c0b56db9b998c59c1afec06e0149674e71e88a48e3d181
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.