diff for duplicates of <4BA9CC64.5010807@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 64ca5bc..c1644e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ On 03/24/2010 12:12 AM, Giel van Schijndel wrote: > --- a/Documentation/hwmon/f71882fg > +++ b/Documentation/hwmon/f71882fg > @@ -2,6 +2,10 @@ Kernel driver f71882fg -> =========== +> ====================== > > Supported chips: > + * Fintek F71808E @@ -128,21 +128,21 @@ On 03/24/2010 12:12 AM, Giel van Schijndel wrote: > data->temp_type[1] = 6; > break; > } -> + } else if (data->type = f71808fg) { +> + } else if (data->type == f71808fg) { > + reg = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE); > + data->temp_type[1] = (reg& 0x02) ? 2 : 4; > + data->temp_type[2] = (reg& 0x04) ? 2 : 4; > + > } else { > reg2 = f71882fg_read8(data, F71882FG_REG_PECI); -> if ((reg2& 0x03) = 0x01) +> if ((reg2& 0x03) == 0x01) > @@ -1871,7 +1898,8 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev, > > val /= 1000; > -> - if (data->type = f71889fg) -> + if (data->type = f71889fg -> + || data->type = f71808fg) +> - if (data->type == f71889fg) +> + if (data->type == f71889fg +> + || data->type == f71808fg) > val = SENSORS_LIMIT(val, -128, 127); > else > val = SENSORS_LIMIT(val, 0, 127); @@ -174,7 +174,7 @@ In the f71862fg case, end the f71862fg case with a break and remove the if test from the f71808fg case. > + case f71808fg: -> + if (data->type = f71808fg) { +> + if (data->type == f71808fg) { > + err = f71882fg_create_sysfs_files(pdev, > + f71808_in_attr, > + ARRAY_SIZE(f71808_in_attr)); @@ -202,7 +202,8 @@ the if test from the f71808fg case. > + case f71808fg: > case f71889fg: > for (i = 0; i< nr_fans; i++) { -> data->pwm_auto_point_mapping[i] > @@ -2126,8 +2175,20 @@ static int f71882fg_remove(struct platform_device *pdev) +> data->pwm_auto_point_mapping[i] = +> @@ -2126,8 +2175,20 @@ static int f71882fg_remove(struct platform_device *pdev) > /* fall through! */ > case f71862fg: > f71882fg_remove_sysfs_files(pdev, @@ -219,7 +220,7 @@ the if test from the f71808fg case. Idem. > + case f71808fg: -> + if (data->type = f71808fg) +> + if (data->type == f71808fg) > + f71882fg_remove_sysfs_files(pdev, > + f71808_in_attr, > + ARRAY_SIZE(f71808_in_attr)); @@ -243,8 +244,3 @@ Idem. Regards, Hans - -_______________________________________________ -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 4403b98..135093b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020100323141718.GA23172@salidar.me.mortis.eu\0" "ref\01269385936-3440-1-git-send-email-me@mortis.eu\0" "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [lm-sensors] [PATCH 1/4] [RFC] hwmon: f71882fg: Add support for\0" - "Date\0Wed, 24 Mar 2010 08:25:08 +0000\0" + "Subject\0Re: [PATCH 1/4] [RFC] hwmon: f71882fg: Add support for the Fintek F71808E\0" + "Date\0Wed, 24 Mar 2010 09:25:08 +0100\0" "To\0Giel van Schijndel <me@mortis.eu>\0" "Cc\0Jean Delvare <khali@linux-fr.org>" Jonathan Cameron <jic23@cam.ac.uk> @@ -39,7 +39,7 @@ "> --- a/Documentation/hwmon/f71882fg\n" "> +++ b/Documentation/hwmon/f71882fg\n" "> @@ -2,6 +2,10 @@ Kernel driver f71882fg\n" - "> ===========\n" + "> ======================\n" ">\n" "> Supported chips:\n" "> + * Fintek F71808E\n" @@ -141,21 +141,21 @@ "> \t\t\t\tdata->temp_type[1] = 6;\n" "> \t\t\t\tbreak;\n" "> \t\t\t}\n" - "> +\t\t} else if (data->type = f71808fg) {\n" + "> +\t\t} else if (data->type == f71808fg) {\n" "> +\t\t\treg = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);\n" "> +\t\t\tdata->temp_type[1] = (reg& 0x02) ? 2 : 4;\n" "> +\t\t\tdata->temp_type[2] = (reg& 0x04) ? 2 : 4;\n" "> +\n" "> \t\t} else {\n" "> \t\t\treg2 = f71882fg_read8(data, F71882FG_REG_PECI);\n" - "> \t\t\tif ((reg2& 0x03) = 0x01)\n" + "> \t\t\tif ((reg2& 0x03) == 0x01)\n" "> @@ -1871,7 +1898,8 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev,\n" ">\n" "> \tval /= 1000;\n" ">\n" - "> -\tif (data->type = f71889fg)\n" - "> +\tif (data->type = f71889fg\n" - "> +\t || data->type = f71808fg)\n" + "> -\tif (data->type == f71889fg)\n" + "> +\tif (data->type == f71889fg\n" + "> +\t || data->type == f71808fg)\n" "> \t\tval = SENSORS_LIMIT(val, -128, 127);\n" "> \telse\n" "> \t\tval = SENSORS_LIMIT(val, 0, 127);\n" @@ -187,7 +187,7 @@ "the if test from the f71808fg case.\n" "\n" "> +\t\tcase f71808fg:\n" - "> +\t\t\tif (data->type = f71808fg) {\n" + "> +\t\t\tif (data->type == f71808fg) {\n" "> +\t\t\t\terr = f71882fg_create_sysfs_files(pdev,\n" "> +\t\t\t\t\t\tf71808_in_attr,\n" "> +\t\t\t\t\t\tARRAY_SIZE(f71808_in_attr));\n" @@ -215,7 +215,8 @@ "> +\t\tcase f71808fg:\n" "> \t\tcase f71889fg:\n" "> \t\t\tfor (i = 0; i< nr_fans; i++) {\n" - "> \t\t\t\tdata->pwm_auto_point_mapping[i] > @@ -2126,8 +2175,20 @@ static int f71882fg_remove(struct platform_device *pdev)\n" + "> \t\t\t\tdata->pwm_auto_point_mapping[i] =\n" + "> @@ -2126,8 +2175,20 @@ static int f71882fg_remove(struct platform_device *pdev)\n" "> \t\t\t/* fall through! */\n" "> \t\tcase f71862fg:\n" "> \t\t\tf71882fg_remove_sysfs_files(pdev,\n" @@ -232,7 +233,7 @@ "Idem.\n" "\n" "> +\t\tcase f71808fg:\n" - "> +\t\t\tif (data->type = f71808fg)\n" + "> +\t\t\tif (data->type == f71808fg)\n" "> +\t\t\t\tf71882fg_remove_sysfs_files(pdev,\n" "> +\t\t\t\t\t\tf71808_in_attr,\n" "> +\t\t\t\t\t\tARRAY_SIZE(f71808_in_attr));\n" @@ -255,11 +256,6 @@ "\n" "Regards,\n" "\n" - "Hans\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + Hans -0ead48e7b47ca9621bcce529c72bf2e5b83eb4acdf4c919968bddbccb2c38a78 +dfd4a2eb2604a030205aa8022a08051c7c5a4e84f173af52f8bf80d860abe902
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.