diff for duplicates of <4D680FAE.80600@cam.ac.uk> diff --git a/a/1.txt b/N1/1.txt index 9f50797..73d3b63 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -241,7 +241,7 @@ list only contains pmbus drivers directly managed by this driver. > + > + 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; @@ -1028,7 +1028,7 @@ Worth pulling out to a utility function used by both? > + 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 { @@ -1048,7 +1048,7 @@ Worth pulling out to a utility function used by both? > + 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) @@ -1073,7 +1073,7 @@ Worth pulling out to a utility function used by both? > + 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) */ @@ -1085,7 +1085,7 @@ Worth pulling out to a utility function used by both? > + } > + > + /* scale result to micro-units for power sensors */ -> + if (sensor->class = PSC_POWER) { +> + if (sensor->class == PSC_POWER) { > + R += 3; > + b *= 1000; > + } @@ -1124,7 +1124,7 @@ Worth pulling out to a utility function used by both? > + bool negative = false; > + > + /* simple case */ -> + if (val = 0) +> + if (val == 0) > + return 0; > + > + if (val < 0) { @@ -1132,7 +1132,7 @@ Worth pulling out to a utility function used by both? > + 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. @@ -1148,14 +1148,14 @@ Worth pulling out to a utility function used by both? > + } > + > + /* 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 */ @@ -1194,7 +1194,7 @@ Worth pulling out to a utility function used by both? > + 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; > + } @@ -1505,10 +1505,12 @@ const? > + 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; @@ -1516,10 +1518,12 @@ const? > + } > + } > + 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; @@ -2357,9 +2361,3 @@ an identify function? > +}; > + > +#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 1c1d636..09d0890 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01297969217-9564-1-git-send-email-guenter.roeck@ericsson.com\0" "ref\01297969217-9564-2-git-send-email-guenter.roeck@ericsson.com\0" "From\0Jonathan Cameron <jic23@cam.ac.uk>\0" - "Subject\0Re: [lm-sensors] [PATCH v4 1/5] hwmon: PMBus device driver\0" + "Subject\0Re: [PATCH v4 1/5] hwmon: PMBus device driver\0" "Date\0Fri, 25 Feb 2011 20:23:10 +0000\0" "To\0Guenter Roeck <guenter.roeck@ericsson.com>\0" "Cc\0Jean Delvare <khali@linux-fr.org>" @@ -256,7 +256,7 @@ "> +\n" "> +\tmutex_lock(&pmbus_list_mutex);\n" "> +\tlist_for_each_entry(p, &pmbus_list, list) {\n" - "> +\t\tif (p->client = client) {\n" + "> +\t\tif (p->client == client) {\n" "> +\t\t\tlist_del(&p->list);\n" "> +\t\t\tkfree(p);\n" "> +\t\t\tbreak;\n" @@ -1043,7 +1043,7 @@ "> +\ts16 exponent, mantissa;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (sensor->class = PSC_VOLTAGE_OUT) {\n" + "> +\tif (sensor->class == PSC_VOLTAGE_OUT) {\n" "> +\t\texponent = data->exponent;\n" "> +\t\tmantissa = (s16) sensor->data;\n" "> +\t} else {\n" @@ -1063,7 +1063,7 @@ "> +\t\tval = val * 1000L;\n" "> +\n" "> +\t/* scale result to micro-units for power sensors */\n" - "> +\tif (sensor->class = PSC_POWER)\n" + "> +\tif (sensor->class == PSC_POWER)\n" "> +\t\tval = val * 1000L;\n" "> +\n" "> +\tif (exponent >= 0)\n" @@ -1088,7 +1088,7 @@ "> +\tb = data->info->b[sensor->class];\n" "> +\tR = data->info->R[sensor->class];\n" "> +\n" - "> +\tif (m = 0)\n" + "> +\tif (m == 0)\n" "> +\t\treturn 0;\n" "> +\n" "> +\t/* X = 1/m * (Y * 10^-R - b) */\n" @@ -1100,7 +1100,7 @@ "> +\t}\n" "> +\n" "> +\t/* scale result to micro-units for power sensors */\n" - "> +\tif (sensor->class = PSC_POWER) {\n" + "> +\tif (sensor->class == PSC_POWER) {\n" "> +\t\tR += 3;\n" "> +\t\tb *= 1000;\n" "> +\t}\n" @@ -1139,7 +1139,7 @@ "> +\tbool negative = false;\n" "> +\n" "> +\t/* simple case */\n" - "> +\tif (val = 0)\n" + "> +\tif (val == 0)\n" "> +\t\treturn 0;\n" "> +\n" "> +\tif (val < 0) {\n" @@ -1147,7 +1147,7 @@ "> +\t\tval = -val;\n" "> +\t}\n" "> +\n" - "> +\tif (class = PSC_VOLTAGE_OUT) {\n" + "> +\tif (class == PSC_VOLTAGE_OUT) {\n" "> +\t\t/*\n" "> +\t\t * For a static exponents, we don't have a choice\n" "> +\t\t * but to adjust the value to it.\n" @@ -1163,14 +1163,14 @@ "> +\t}\n" "> +\n" "> +\t/* Power is in uW. Convert to mW before converting. */\n" - "> +\tif (class = PSC_POWER)\n" + "> +\tif (class == PSC_POWER)\n" "> +\t\tval = DIV_ROUND_CLOSEST(val, 1000L);\n" "> +\n" "> +\t/*\n" "> +\t * For simplicity, convert fan data to milli-units\n" "> +\t * before calculating the exponent.\n" "> +\t */\n" - "> +\tif (class = PSC_FAN)\n" + "> +\tif (class == PSC_FAN)\n" "> +\t\tval = val * 1000;\n" "> +\n" "> +\t/* Reduce large mantissa until it fits into 10 bit */\n" @@ -1209,7 +1209,7 @@ "> +\tR = data->info->R[class];\n" "> +\n" "> +\t/* Power is in uW. Adjust R and b. */\n" - "> +\tif (class = PSC_POWER) {\n" + "> +\tif (class == PSC_POWER) {\n" "> +\t\tR -= 3;\n" "> +\t\tb *= 1000;\n" "> +\t}\n" @@ -1520,10 +1520,12 @@ "> +\t\t\tmax_labels++;\n" "> +\t\t}\n" "> +\t\tif (info->func[page] & PMBUS_HAVE_FAN12) {\n" - "> +\t\t\tif (page = 0) {\n" - "> +\t\t\t\tmax_sensors +> +\t\t\t\t ARRAY_SIZE(pmbus_fan_registers) *\n" + "> +\t\t\tif (page == 0) {\n" + "> +\t\t\t\tmax_sensors +=\n" + "> +\t\t\t\t ARRAY_SIZE(pmbus_fan_registers) *\n" "> +\t\t\t\t PMBUS_MAX_SENSORS_PER_FAN;\n" - "> +\t\t\t\tmax_booleans +> +\t\t\t\t ARRAY_SIZE(pmbus_fan_registers) *\n" + "> +\t\t\t\tmax_booleans +=\n" + "> +\t\t\t\t ARRAY_SIZE(pmbus_fan_registers) *\n" "> +\t\t\t\t PMBUS_MAX_BOOLEANS_PER_FAN;\n" "> +\t\t\t} else {\n" "> +\t\t\t\tmax_sensors += PMBUS_MAX_SENSORS_PER_FAN;\n" @@ -1531,10 +1533,12 @@ "> +\t\t\t}\n" "> +\t\t}\n" "> +\t\tif (info->func[page] & PMBUS_HAVE_TEMP) {\n" - "> +\t\t\tif (page = 0) {\n" - "> +\t\t\t\tmax_sensors +> +\t\t\t\t ARRAY_SIZE(pmbus_temp_registers) *\n" + "> +\t\t\tif (page == 0) {\n" + "> +\t\t\t\tmax_sensors +=\n" + "> +\t\t\t\t ARRAY_SIZE(pmbus_temp_registers) *\n" "> +\t\t\t\t PMBUS_MAX_SENSORS_PER_TEMP;\n" - "> +\t\t\t\tmax_booleans +> +\t\t\t\t ARRAY_SIZE(pmbus_temp_registers) *\n" + "> +\t\t\t\tmax_booleans +=\n" + "> +\t\t\t\t ARRAY_SIZE(pmbus_temp_registers) *\n" "> +\t\t\t\t PMBUS_MAX_BOOLEANS_PER_TEMP;\n" "> +\t\t\t} else {\n" "> +\t\t\t\tmax_sensors += PMBUS_MAX_SENSORS_PER_TEMP;\n" @@ -2371,12 +2375,6 @@ "> +\tu32 flags;\t\t/* Device specific flags */\n" "> +};\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 + > +#endif /* _PMBUS_H_ */ -46f86de1ff308e3f6bdc822d4e699f4fd734348280dd2aa831b2e155f709da05 +29342c8747cdf7d15dc230d0f17d902d64164a1cc105a1bdf3cbbbf09e794221
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.