diff for duplicates of <4712F66F.8040806@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 6b1a447..0dfe63b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -146,9 +146,9 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/f718
  	}
  
 -	*address = superio_inw(sioaddr, SIO_REG_ADDR);
--	if (*address = 0) {
+-	if (*address == 0) {
 +	address = superio_inw(gate, SIO_REG_ADDR);
-+	if (address = 0) {
++	if (address == 0) {
  		printk(KERN_WARNING DRVNAME ": Base address not set, "
  		       "skipping\n");
  		goto exit;
@@ -289,7 +289,7 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/it87
  
 -	*address = superio_inw(IT87_BASE_REG) & ~(IT87_EXTENT - 1);
 +	*address = superio_inw(gate, IT87_BASE_REG) & ~(IT87_EXTENT - 1);
- 	if (*address = 0) {
+ 	if (*address == 0) {
  		pr_info("it87: Base address not set, skipping\n");
  		goto exit;
 @@ -930,17 +908,17 @@ static int __init it87_find(unsigned sho
@@ -305,7 +305,7 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/it87
  
 -		superio_select(GPIO);
 +		superio_select(gate, GPIO);
- 		if (chip_type = it8718)
+ 		if (chip_type == it8718)
 -			sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
 +			sio_data->vid_value = superio_inb(gate, IT87_SIO_VID_REG);
  
@@ -472,7 +472,7 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/smsc
  
  	printk(KERN_INFO DRVNAME ": found SMSC %s "
  		"(base address 0x%04x, revision %u)\n",
- 		id = 0x81 ? "SCH5307-NS" : id = 0x85 ? "SCH5317" :
+ 		id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" :
  	       "LPC47B397-NC", *addr, rev);
  
 -	superio_exit();
@@ -577,7 +577,7 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/smsc
 +	*addr = (superio_inb(gate, SUPERIO_REG_BASE) << 8)
 +	      |  superio_inb(gate, SUPERIO_REG_BASE + 1);
 +	val = superio_inb(gate, SUPERIO_REG_ACT);
- 	if (*addr = 0 || (val & 0x01) = 0) {
+ 	if (*addr == 0 || (val & 0x01) == 0) {
  		pr_info(DRVNAME ": Device is disabled, will not use\n");
 -		superio_exit();
 +		superio_exit(gate);
@@ -668,8 +668,8 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/vt12
  
 -	superio_select(sio_cip, SIO_VT1211_LDN_HWMON);
 -
--	if ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) = 0) {
-+	if ((superio_inb(gate, SIO_VT1211_ACTIVE) & 1) = 0) {
+-	if ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) == 0) {
++	if ((superio_inb(gate, SIO_VT1211_ACTIVE) & 1) == 0) {
  		printk(KERN_WARNING DRVNAME ": HW monitor is disabled, "
  		       "skipping\n");
  		goto EXIT;
@@ -677,10 +677,10 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/vt12
  
 -	*address = ((superio_inb(sio_cip, SIO_VT1211_BADDR) << 8) |
 -		    (superio_inb(sio_cip, SIO_VT1211_BADDR + 1))) & 0xff00;
--	if (*address = 0) {
+-	if (*address == 0) {
 +	address = superio_inw(gate, SIO_VT1211_BADDR);
 +
-+	if (address = 0) {
++	if (address == 0) {
  		printk(KERN_WARNING DRVNAME ": Base address is not set, "
  		       "skipping\n");
  		goto EXIT;
@@ -790,7 +790,7 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/w836
 -		superio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,
 -			     en_vrm10 & ~0x08);
 +		superio_outb(gate, SIO_REG_EN_VRM10, en_vrm10 & ~0x08);
- 	} else if (!(en_vrm10 & 0x08) && data->vrm = 100) {
+ 	} else if (!(en_vrm10 & 0x08) && data->vrm == 100) {
  		dev_warn(dev, "Setting VID input voltage to VRM10\n");
 -		superio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,
 -			     en_vrm10 | 0x08);
@@ -864,12 +864,12 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/w836
 -	val = (superio_inb(sioaddr, SIO_REG_ADDR) << 8)
 -	    | superio_inb(sioaddr, SIO_REG_ADDR + 1);
 -	*addr = val & IOREGION_ALIGNMENT;
--	if (*addr = 0) {
+-	if (*addr == 0) {
 +	superio_select(gate, W83627EHF_LD_HWM);
 +	val = (superio_inb(gate, SIO_REG_ADDR) << 8)
 +	    | superio_inb(gate, SIO_REG_ADDR + 1);
 +	addr = val & IOREGION_ALIGNMENT;
-+	if (addr = 0) {
++	if (addr == 0) {
  		printk(KERN_ERR DRVNAME ": Refusing to enable a Super-I/O "
  		       "device with a base I/O port 0.\n");
 -		superio_exit(sioaddr);
@@ -915,22 +915,3 @@ diff -ruNp -X dontdiff -X exclude-diffs hwmon-fan-push-offset/drivers/hwmon/w836
  		return -ENODEV;
  
  	err = platform_driver_register(&w83627ehf_driver);
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-_______________________________________________
-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 1fbf787..168780f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Jim Cromie <jim.cromie@gmail.com>\0"
- "Subject\0[lm-sensors] [ patch .24-rc0 5/5 ] SuperIO locks coordinator - use\0"
- "Date\0Mon, 15 Oct 2007 05:11:11 +0000\0"
+ "Subject\0[ patch .24-rc0 5/5 ] SuperIO locks coordinator - use in other hwmon/*.c\0"
+ "Date\0Sun, 14 Oct 2007 23:11:11 -0600\0"
  "To\0Linux kernel <linux-kernel@vger.kernel.org>"
  " LM Sensors <lm-sensors@lm-sensors.org>\0"
  "\00:1\0"
@@ -153,9 +153,9 @@
  " \t}\n"
  " \n"
  "-\t*address = superio_inw(sioaddr, SIO_REG_ADDR);\n"
- "-\tif (*address = 0) {\n"
+ "-\tif (*address == 0) {\n"
  "+\taddress = superio_inw(gate, SIO_REG_ADDR);\n"
- "+\tif (address = 0) {\n"
+ "+\tif (address == 0) {\n"
  " \t\tprintk(KERN_WARNING DRVNAME \": Base address not set, \"\n"
  " \t\t       \"skipping\\n\");\n"
  " \t\tgoto exit;\n"
@@ -296,7 +296,7 @@
  " \n"
  "-\t*address = superio_inw(IT87_BASE_REG) & ~(IT87_EXTENT - 1);\n"
  "+\t*address = superio_inw(gate, IT87_BASE_REG) & ~(IT87_EXTENT - 1);\n"
- " \tif (*address = 0) {\n"
+ " \tif (*address == 0) {\n"
  " \t\tpr_info(\"it87: Base address not set, skipping\\n\");\n"
  " \t\tgoto exit;\n"
  "@@ -930,17 +908,17 @@ static int __init it87_find(unsigned sho\n"
@@ -312,7 +312,7 @@
  " \n"
  "-\t\tsuperio_select(GPIO);\n"
  "+\t\tsuperio_select(gate, GPIO);\n"
- " \t\tif (chip_type = it8718)\n"
+ " \t\tif (chip_type == it8718)\n"
  "-\t\t\tsio_data->vid_value = superio_inb(IT87_SIO_VID_REG);\n"
  "+\t\t\tsio_data->vid_value = superio_inb(gate, IT87_SIO_VID_REG);\n"
  " \n"
@@ -479,7 +479,7 @@
  " \n"
  " \tprintk(KERN_INFO DRVNAME \": found SMSC %s \"\n"
  " \t\t\"(base address 0x%04x, revision %u)\\n\",\n"
- " \t\tid = 0x81 ? \"SCH5307-NS\" : id = 0x85 ? \"SCH5317\" :\n"
+ " \t\tid == 0x81 ? \"SCH5307-NS\" : id == 0x85 ? \"SCH5317\" :\n"
  " \t       \"LPC47B397-NC\", *addr, rev);\n"
  " \n"
  "-\tsuperio_exit();\n"
@@ -584,7 +584,7 @@
  "+\t*addr = (superio_inb(gate, SUPERIO_REG_BASE) << 8)\n"
  "+\t      |  superio_inb(gate, SUPERIO_REG_BASE + 1);\n"
  "+\tval = superio_inb(gate, SUPERIO_REG_ACT);\n"
- " \tif (*addr = 0 || (val & 0x01) = 0) {\n"
+ " \tif (*addr == 0 || (val & 0x01) == 0) {\n"
  " \t\tpr_info(DRVNAME \": Device is disabled, will not use\\n\");\n"
  "-\t\tsuperio_exit();\n"
  "+\t\tsuperio_exit(gate);\n"
@@ -675,8 +675,8 @@
  " \n"
  "-\tsuperio_select(sio_cip, SIO_VT1211_LDN_HWMON);\n"
  "-\n"
- "-\tif ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) = 0) {\n"
- "+\tif ((superio_inb(gate, SIO_VT1211_ACTIVE) & 1) = 0) {\n"
+ "-\tif ((superio_inb(sio_cip, SIO_VT1211_ACTIVE) & 1) == 0) {\n"
+ "+\tif ((superio_inb(gate, SIO_VT1211_ACTIVE) & 1) == 0) {\n"
  " \t\tprintk(KERN_WARNING DRVNAME \": HW monitor is disabled, \"\n"
  " \t\t       \"skipping\\n\");\n"
  " \t\tgoto EXIT;\n"
@@ -684,10 +684,10 @@
  " \n"
  "-\t*address = ((superio_inb(sio_cip, SIO_VT1211_BADDR) << 8) |\n"
  "-\t\t    (superio_inb(sio_cip, SIO_VT1211_BADDR + 1))) & 0xff00;\n"
- "-\tif (*address = 0) {\n"
+ "-\tif (*address == 0) {\n"
  "+\taddress = superio_inw(gate, SIO_VT1211_BADDR);\n"
  "+\n"
- "+\tif (address = 0) {\n"
+ "+\tif (address == 0) {\n"
  " \t\tprintk(KERN_WARNING DRVNAME \": Base address is not set, \"\n"
  " \t\t       \"skipping\\n\");\n"
  " \t\tgoto EXIT;\n"
@@ -797,7 +797,7 @@
  "-\t\tsuperio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,\n"
  "-\t\t\t     en_vrm10 & ~0x08);\n"
  "+\t\tsuperio_outb(gate, SIO_REG_EN_VRM10, en_vrm10 & ~0x08);\n"
- " \t} else if (!(en_vrm10 & 0x08) && data->vrm = 100) {\n"
+ " \t} else if (!(en_vrm10 & 0x08) && data->vrm == 100) {\n"
  " \t\tdev_warn(dev, \"Setting VID input voltage to VRM10\\n\");\n"
  "-\t\tsuperio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,\n"
  "-\t\t\t     en_vrm10 | 0x08);\n"
@@ -871,12 +871,12 @@
  "-\tval = (superio_inb(sioaddr, SIO_REG_ADDR) << 8)\n"
  "-\t    | superio_inb(sioaddr, SIO_REG_ADDR + 1);\n"
  "-\t*addr = val & IOREGION_ALIGNMENT;\n"
- "-\tif (*addr = 0) {\n"
+ "-\tif (*addr == 0) {\n"
  "+\tsuperio_select(gate, W83627EHF_LD_HWM);\n"
  "+\tval = (superio_inb(gate, SIO_REG_ADDR) << 8)\n"
  "+\t    | superio_inb(gate, SIO_REG_ADDR + 1);\n"
  "+\taddr = val & IOREGION_ALIGNMENT;\n"
- "+\tif (addr = 0) {\n"
+ "+\tif (addr == 0) {\n"
  " \t\tprintk(KERN_ERR DRVNAME \": Refusing to enable a Super-I/O \"\n"
  " \t\t       \"device with a base I/O port 0.\\n\");\n"
  "-\t\tsuperio_exit(sioaddr);\n"
@@ -921,25 +921,6 @@
  "+\tif (w83627ehf_find(&sio_data))\n"
  " \t\treturn -ENODEV;\n"
  " \n"
- " \terr = platform_driver_register(&w83627ehf_driver);\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\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
+ " \terr = platform_driver_register(&w83627ehf_driver);"
 
-67d81e20d7f96b69ac7711136e65615096e1399ee28874aa39e51caab2e53b8f
+62470049eb01c6b60a2cae47a0e9e453ec8a8140ca16e100c892b71a676b0220
