diff for duplicates of <20100322112308.13d58db4@hyperion.delvare>

diff --git a/a/1.txt b/N1/1.txt
index d17de71..16aa340 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,7 @@ On Sun, 21 Mar 2010 16:37:14 +0100, Giel van Schijndel wrote:
 > -	long val = simple_strtol(buf, NULL, 10);
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 
 That's not correct. You want to return an error if strict_strtol()
@@ -36,7 +36,7 @@ always be the case in the future.
 > -	unsigned long val = simple_strtoul(buf, NULL, 10);
 > +	unsigned long val;
 > +
-> +	if (strict_strtoul(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtoul(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	mutex_lock(&data->update_lock);
@@ -48,7 +48,7 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10) / 8;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 8;
@@ -62,7 +62,7 @@ always be the case in the future.
 > -	unsigned long val = simple_strtoul(buf, NULL, 10);
 > +	unsigned long val;
 > +
-> +	if (strict_strtoul(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtoul(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	mutex_lock(&data->update_lock);
@@ -74,7 +74,7 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10) / 1000;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 1000;
@@ -90,7 +90,7 @@ always be the case in the future.
 >  	u8 reg;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 1000;
@@ -104,7 +104,7 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10) / 1000;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 1000;
@@ -118,7 +118,7 @@ always be the case in the future.
 > -	unsigned long val = simple_strtoul(buf, NULL, 10);
 > +	unsigned long val;
 > +
-> +	if (strict_strtoul(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtoul(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	mutex_lock(&data->update_lock);
@@ -130,7 +130,7 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10);
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 >  	val = SENSORS_LIMIT(val, 0, 255);
@@ -143,11 +143,11 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10);
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	/* Special case for F8000 pwm channel 3 which only does auto mode */
->  	if (data->type = f8000 && nr = 2 && val != 2)
+>  	if (data->type == f8000 && nr == 2 && val != 2)
 > @@ -1628,7 +1667,11 @@ static ssize_t store_pwm_auto_point_pwm(struct device *dev,
 >  	struct f71882fg_data *data = dev_get_drvdata(dev);
 >  	int pwm = to_sensor_dev_attr_2(devattr)->index;
@@ -155,7 +155,7 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10);
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 >  	val = SENSORS_LIMIT(val, 0, 255);
@@ -169,31 +169,33 @@ always be the case in the future.
 >  	u8 reg;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 1000;
 >  
 >  	mutex_lock(&data->update_lock);
->  	data->pwm_auto_point_temp[nr][point] > @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,
+>  	data->pwm_auto_point_temp[nr][point] =
+> @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,
 >  {
 >  	struct f71882fg_data *data = dev_get_drvdata(dev);
 >  	int nr = to_sensor_dev_attr_2(devattr)->index;
 > -	unsigned long val = simple_strtoul(buf, NULL, 10);
 > +	unsigned long val;
 > +
-> +	if (strict_strtoul(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtoul(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	mutex_lock(&data->update_lock);
->  	data->pwm_auto_point_mapping[nr] > @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,
+>  	data->pwm_auto_point_mapping[nr] =
+> @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,
 >  {
 >  	struct f71882fg_data *data = dev_get_drvdata(dev);
 >  	int nr = to_sensor_dev_attr_2(devattr)->index;
 > -	long val = simple_strtol(buf, NULL, 10);
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 >  
 >  	switch (val) {
@@ -205,19 +207,14 @@ always be the case in the future.
 > -	long val = simple_strtol(buf, NULL, 10) / 1000;
 > +	long val;
 > +
-> +	if (strict_strtol(buf, 10, &val) = -EINVAL)
+> +	if (strict_strtol(buf, 10, &val) == -EINVAL)
 > +		return -EINVAL;
 > +
 > +	val /= 1000;
 >  
->  	if (data->type = f71889fg)
+>  	if (data->type == f71889fg)
 >  		val = SENSORS_LIMIT(val, -128, 127);
 
 
 -- 
 Jean Delvare
-
-_______________________________________________
-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 da60746..96396da 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\01269185834-10266-1-git-send-email-me@mortis.eu\0"
  "ref\01269185834-10266-2-git-send-email-me@mortis.eu\0"
  "From\0Jean Delvare <khali@linux-fr.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH 2/2] Hwmon: f71882fg: use strict_stro(l|ul)\0"
- "Date\0Mon, 22 Mar 2010 10:23:08 +0000\0"
+ "Subject\0Re: [PATCH 2/2] Hwmon: f71882fg: use strict_stro(l|ul) instead of simple_strto$1\0"
+ "Date\0Mon, 22 Mar 2010 11:23:08 +0100\0"
  "To\0Giel van Schijndel <me@mortis.eu>\0"
  "Cc\0Hans de Goede <hdegoede@redhat.com>"
   Jonathan Cameron <jic23@cam.ac.uk>
@@ -30,7 +30,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10);\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "\n"
  "That's not correct. You want to return an error if strict_strtol()\n"
@@ -48,7 +48,7 @@
  "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n"
  "> +\tunsigned long val;\n"
  "> +\n"
- "> +\tif (strict_strtoul(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtoul(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \tmutex_lock(&data->update_lock);\n"
@@ -60,7 +60,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10) / 8;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 8;\n"
@@ -74,7 +74,7 @@
  "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n"
  "> +\tunsigned long val;\n"
  "> +\n"
- "> +\tif (strict_strtoul(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtoul(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \tmutex_lock(&data->update_lock);\n"
@@ -86,7 +86,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 1000;\n"
@@ -102,7 +102,7 @@
  ">  \tu8 reg;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 1000;\n"
@@ -116,7 +116,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 1000;\n"
@@ -130,7 +130,7 @@
  "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n"
  "> +\tunsigned long val;\n"
  "> +\n"
- "> +\tif (strict_strtoul(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtoul(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \tmutex_lock(&data->update_lock);\n"
@@ -142,7 +142,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10);\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  ">  \tval = SENSORS_LIMIT(val, 0, 255);\n"
@@ -155,11 +155,11 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10);\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \t/* Special case for F8000 pwm channel 3 which only does auto mode */\n"
- ">  \tif (data->type = f8000 && nr = 2 && val != 2)\n"
+ ">  \tif (data->type == f8000 && nr == 2 && val != 2)\n"
  "> @@ -1628,7 +1667,11 @@ static ssize_t store_pwm_auto_point_pwm(struct device *dev,\n"
  ">  \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n"
  ">  \tint pwm = to_sensor_dev_attr_2(devattr)->index;\n"
@@ -167,7 +167,7 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10);\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  ">  \tval = SENSORS_LIMIT(val, 0, 255);\n"
@@ -181,31 +181,33 @@
  ">  \tu8 reg;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 1000;\n"
  ">  \n"
  ">  \tmutex_lock(&data->update_lock);\n"
- ">  \tdata->pwm_auto_point_temp[nr][point] > @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,\n"
+ ">  \tdata->pwm_auto_point_temp[nr][point] =\n"
+ "> @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,\n"
  ">  {\n"
  ">  \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n"
  ">  \tint nr = to_sensor_dev_attr_2(devattr)->index;\n"
  "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n"
  "> +\tunsigned long val;\n"
  "> +\n"
- "> +\tif (strict_strtoul(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtoul(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \tmutex_lock(&data->update_lock);\n"
- ">  \tdata->pwm_auto_point_mapping[nr] > @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,\n"
+ ">  \tdata->pwm_auto_point_mapping[nr] =\n"
+ "> @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,\n"
  ">  {\n"
  ">  \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n"
  ">  \tint nr = to_sensor_dev_attr_2(devattr)->index;\n"
  "> -\tlong val = simple_strtol(buf, NULL, 10);\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  ">  \n"
  ">  \tswitch (val) {\n"
@@ -217,21 +219,16 @@
  "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n"
  "> +\tlong val;\n"
  "> +\n"
- "> +\tif (strict_strtol(buf, 10, &val) = -EINVAL)\n"
+ "> +\tif (strict_strtol(buf, 10, &val) == -EINVAL)\n"
  "> +\t\treturn -EINVAL;\n"
  "> +\n"
  "> +\tval /= 1000;\n"
  ">  \n"
- ">  \tif (data->type = f71889fg)\n"
+ ">  \tif (data->type == f71889fg)\n"
  ">  \t\tval = SENSORS_LIMIT(val, -128, 127);\n"
  "\n"
  "\n"
  "-- \n"
- "Jean Delvare\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ Jean Delvare
 
-3c155f3ff757ab7b3e82720514603ad5dc3021fb290538792a3c2d1fa6ecf89f
+d85df9df46625eac1910a1586f1a3ff74c5f858f6187bae445a17d6ba6194c5b
