diff for duplicates of <11059983963929@kroah.com> diff --git a/a/1.txt b/N1/1.txt index bd88c05..738c281 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ ChangeSet 1.2329.2.8, 2005/01/14 14:43:50-08:00, rafael.espindola@gmail.com I have ported the support for the EMC6D100 sensor from kernel 2.4 to kernel 2.6. In the process I received some comments from Jean Delvare. -Signed-off-by: Rafael ??vila de Esp??ndola <rafael.espindola@gmail.com> +Signed-off-by: Rafael Ãvila de EspÃndola <rafael.espindola@gmail.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> @@ -87,29 +87,29 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c struct lm85_zone zone[3]; }; @@ -1072,7 +1083,7 @@ - && verstep = LM85_VERSTEP_LM85B ) { + && verstep == LM85_VERSTEP_LM85B ) { kind = lm85b ; - } else if( company = LM85_COMPANY_NATIONAL -- && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { -+ && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC ) { + } else if( company == LM85_COMPANY_NATIONAL +- && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { ++ && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) { dev_err(&adapter->dev, "Unrecognized version/stepping 0x%02x" " Defaulting to LM85.\n", verstep); kind = any_chip ; @@ -1083,17 +1094,34 @@ - && verstep = LM85_VERSTEP_ADT7463 ) { + && verstep == LM85_VERSTEP_ADT7463 ) { kind = adt7463 ; - } else if( company = LM85_COMPANY_ANALOG_DEV -- && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { -+ && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC ) { + } else if( company == LM85_COMPANY_ANALOG_DEV +- && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { ++ && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) { dev_err(&adapter->dev, "Unrecognized version/stepping 0x%02x" - " Defaulting to ADM1027.\n", verstep); - kind = adm1027 ; -- } else if( kind = 0 && (verstep & 0xf0) = 0x60) { +- } else if( kind == 0 && (verstep & 0xf0) == 0x60) { + " Defaulting to Generic LM85.\n", verstep ); + kind = any_chip ; -+ } else if( company = LM85_COMPANY_SMSC -+ && (verstep = LM85_VERSTEP_EMC6D100_A0 -+ || verstep = LM85_VERSTEP_EMC6D100_A1) ) { ++ } else if( company == LM85_COMPANY_SMSC ++ && (verstep == LM85_VERSTEP_EMC6D100_A0 ++ || verstep == LM85_VERSTEP_EMC6D100_A1) ) { + /* Unfortunately, we can't tell a '100 from a '101 + * from the registers. Since a '101 is a '100 + * in a package with fewer pins and therefore no @@ -117,29 +117,29 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + * inputs read 0, then it's a '101. + */ + kind = emc6d100 ; -+ } else if( company = LM85_COMPANY_SMSC -+ && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC) { ++ } else if( company == LM85_COMPANY_SMSC ++ && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) { + dev_err(&adapter->dev, "lm85: Detected SMSC chip\n"); + dev_err(&adapter->dev, "lm85: Unrecognized version/stepping 0x%02x" + " Defaulting to Generic LM85.\n", verstep ); + kind = any_chip ; -+ } else if( kind = any_chip -+ && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC) { ++ } else if( kind == any_chip ++ && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) { dev_err(&adapter->dev, "Generic LM85 Version 6 detected\n"); /* Leave kind as "any_chip" */ } else { dev_dbg(&adapter->dev, "Autodetection failed\n"); /* Not an LM85 ... */ -- if( kind = 0 ) { /* User used force=x,y */ -+ if( kind = any_chip ) { /* User used force=x,y */ +- if( kind == 0 ) { /* User used force=x,y */ ++ if( kind == any_chip ) { /* User used force=x,y */ dev_err(&adapter->dev, "Generic LM85 Version 6 not" " found at %d,0x%02x. Try force_lm85c.\n", i2c_adapter_id(adapter), address ); @@ -1114,6 +1142,8 @@ type_name = "adm1027"; - } else if ( kind = adt7463 ) { + } else if ( kind == adt7463 ) { type_name = "adt7463"; -+ } else if ( kind = emc6d100){ ++ } else if ( kind == emc6d100){ + type_name = "emc6d100"; } strlcpy(new_client->name, type_name, I2C_NAME_SIZE); @@ -150,17 +150,20 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + data->alarms = lm85_read_value(client, LM85_REG_ALARM1); + - if ( data->type = adt7463 ) { + if ( data->type == adt7463 ) { if( data->therm_total < ULONG_MAX - 256 ) { - data->therm_total + lm85_read_value(client, ADT7463_REG_THERM ); + data->therm_total += + lm85_read_value(client, ADT7463_REG_THERM ); } -+ } else if ( data->type = emc6d100 ) { ++ } else if ( data->type == emc6d100 ) { + /* Three more voltage sensors */ + for (i = 5; i <= 7; ++i) { -+ data->in[i] + lm85_read_value(client, EMC6D100_REG_IN(i)); ++ data->in[i] = ++ lm85_read_value(client, EMC6D100_REG_IN(i)); + } + /* More alarm bits */ -+ data->alarms |+ lm85_read_value(client, EMC6D100_REG_ALARM3) << 16; ++ data->alarms |= ++ lm85_read_value(client, EMC6D100_REG_ALARM3) << 16; } - data->alarms = lm85_read_value(client, LM85_REG_ALARM1); @@ -170,13 +173,16 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c @@ -1387,6 +1426,15 @@ lm85_read_value(client, LM85_REG_IN_MIN(i)); - data->in_max[i] lm85_read_value(client, LM85_REG_IN_MAX(i)); + data->in_max[i] = + lm85_read_value(client, LM85_REG_IN_MAX(i)); + } + -+ if ( data->type = emc6d100 ) { ++ if ( data->type == emc6d100 ) { + for (i = 5; i <= 7; ++i) { -+ data->in_min[i] + lm85_read_value(client, EMC6D100_REG_IN_MIN(i)); -+ data->in_max[i] + lm85_read_value(client, EMC6D100_REG_IN_MAX(i)); ++ data->in_min[i] = ++ lm85_read_value(client, EMC6D100_REG_IN_MIN(i)); ++ data->in_max[i] = ++ lm85_read_value(client, EMC6D100_REG_IN_MAX(i)); + } } diff --git a/a/content_digest b/N1/content_digest index 507d913..86cef8e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011059983961494@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C: add EMC6D100 support in lm85 driver\0" - "Date\0Thu, 19 May 2005 06:25:31 +0000\0" + "Date\0Mon, 17 Jan 2005 13:46:36 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0rafael.espindola@gmail.com\0" @@ -14,7 +14,7 @@ "I have ported the support for the EMC6D100 sensor from kernel 2.4 to kernel\n" "2.6. In the process I received some comments from Jean Delvare.\n" "\n" - "Signed-off-by: Rafael ??vila de Esp??ndola <rafael.espindola@gmail.com>\n" + "Signed-off-by: Rafael \303\203\302\201vila de Esp\303\203\302\255ndola <rafael.espindola@gmail.com>\n" "Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>\n" "\n" "\n" @@ -96,29 +96,29 @@ " \tstruct lm85_zone zone[3];\n" " };\n" "@@ -1072,7 +1083,7 @@\n" - " \t\t && verstep = LM85_VERSTEP_LM85B ) {\n" + " \t\t && verstep == LM85_VERSTEP_LM85B ) {\n" " \t\t\tkind = lm85b ;\n" - " \t\t} else if( company = LM85_COMPANY_NATIONAL\n" - "-\t\t && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) {\n" - "+\t\t && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC ) {\n" + " \t\t} else if( company == LM85_COMPANY_NATIONAL\n" + "-\t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" + "+\t\t && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) {\n" " \t\t\tdev_err(&adapter->dev, \"Unrecognized version/stepping 0x%02x\"\n" " \t\t\t\t\" Defaulting to LM85.\\n\", verstep);\n" " \t\t\tkind = any_chip ;\n" "@@ -1083,17 +1094,34 @@\n" - " \t\t && verstep = LM85_VERSTEP_ADT7463 ) {\n" + " \t\t && verstep == LM85_VERSTEP_ADT7463 ) {\n" " \t\t\tkind = adt7463 ;\n" - " \t\t} else if( company = LM85_COMPANY_ANALOG_DEV\n" - "-\t\t && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) {\n" - "+\t\t && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC ) {\n" + " \t\t} else if( company == LM85_COMPANY_ANALOG_DEV\n" + "-\t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" + "+\t\t && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC ) {\n" " \t\t\tdev_err(&adapter->dev, \"Unrecognized version/stepping 0x%02x\"\n" "-\t\t\t\t\" Defaulting to ADM1027.\\n\", verstep);\n" "-\t\t\tkind = adm1027 ;\n" - "-\t\t} else if( kind = 0 && (verstep & 0xf0) = 0x60) {\n" + "-\t\t} else if( kind == 0 && (verstep & 0xf0) == 0x60) {\n" "+\t\t\t\t\" Defaulting to Generic LM85.\\n\", verstep );\n" "+\t\t\tkind = any_chip ;\n" - "+\t\t} else if( company = LM85_COMPANY_SMSC\n" - "+\t\t && (verstep = LM85_VERSTEP_EMC6D100_A0\n" - "+\t\t\t || verstep = LM85_VERSTEP_EMC6D100_A1) ) {\n" + "+\t\t} else if( company == LM85_COMPANY_SMSC\n" + "+\t\t && (verstep == LM85_VERSTEP_EMC6D100_A0\n" + "+\t\t\t || verstep == LM85_VERSTEP_EMC6D100_A1) ) {\n" "+\t\t\t/* Unfortunately, we can't tell a '100 from a '101\n" "+\t\t\t * from the registers. Since a '101 is a '100\n" "+\t\t\t * in a package with fewer pins and therefore no\n" @@ -126,29 +126,29 @@ "+\t\t\t * inputs read 0, then it's a '101.\n" "+\t\t\t */\n" "+\t\t\tkind = emc6d100 ;\n" - "+\t\t} else if( company = LM85_COMPANY_SMSC\n" - "+\t\t && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC) {\n" + "+\t\t} else if( company == LM85_COMPANY_SMSC\n" + "+\t\t && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {\n" "+\t\t\tdev_err(&adapter->dev, \"lm85: Detected SMSC chip\\n\");\n" "+\t\t\tdev_err(&adapter->dev, \"lm85: Unrecognized version/stepping 0x%02x\"\n" "+\t\t\t \" Defaulting to Generic LM85.\\n\", verstep );\n" "+\t\t\tkind = any_chip ;\n" - "+\t\t} else if( kind = any_chip\n" - "+\t\t && (verstep & LM85_VERSTEP_VMASK) = LM85_VERSTEP_GENERIC) {\n" + "+\t\t} else if( kind == any_chip\n" + "+\t\t && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) {\n" " \t\t\tdev_err(&adapter->dev, \"Generic LM85 Version 6 detected\\n\");\n" " \t\t\t/* Leave kind as \"any_chip\" */\n" " \t\t} else {\n" " \t\t\tdev_dbg(&adapter->dev, \"Autodetection failed\\n\");\n" " \t\t\t/* Not an LM85 ... */\n" - "-\t\t\tif( kind = 0 ) { /* User used force=x,y */\n" - "+\t\t\tif( kind = any_chip ) { /* User used force=x,y */\n" + "-\t\t\tif( kind == 0 ) { /* User used force=x,y */\n" + "+\t\t\tif( kind == any_chip ) { /* User used force=x,y */\n" " \t\t\t\tdev_err(&adapter->dev, \"Generic LM85 Version 6 not\"\n" " \t\t\t\t\t\" found at %d,0x%02x. Try force_lm85c.\\n\",\n" " \t\t\t\t\ti2c_adapter_id(adapter), address );\n" "@@ -1114,6 +1142,8 @@\n" " \t\ttype_name = \"adm1027\";\n" - " \t} else if ( kind = adt7463 ) {\n" + " \t} else if ( kind == adt7463 ) {\n" " \t\ttype_name = \"adt7463\";\n" - "+\t} else if ( kind = emc6d100){\n" + "+\t} else if ( kind == emc6d100){\n" "+\t\ttype_name = \"emc6d100\";\n" " \t}\n" " \tstrlcpy(new_client->name, type_name, I2C_NAME_SIZE);\n" @@ -159,17 +159,20 @@ " \n" "+\t\tdata->alarms = lm85_read_value(client, LM85_REG_ALARM1);\n" "+\n" - " \t\tif ( data->type = adt7463 ) {\n" + " \t\tif ( data->type == adt7463 ) {\n" " \t\t\tif( data->therm_total < ULONG_MAX - 256 ) {\n" - " \t\t\t data->therm_total + \t\t\t\tlm85_read_value(client, ADT7463_REG_THERM );\n" + " \t\t\t data->therm_total +=\n" + " \t\t\t\tlm85_read_value(client, ADT7463_REG_THERM );\n" " \t\t\t}\n" - "+\t\t} else if ( data->type = emc6d100 ) {\n" + "+\t\t} else if ( data->type == emc6d100 ) {\n" "+\t\t\t/* Three more voltage sensors */\n" "+\t\t\tfor (i = 5; i <= 7; ++i) {\n" - "+\t\t\t\tdata->in[i] +\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN(i));\n" + "+\t\t\t\tdata->in[i] =\n" + "+\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN(i));\n" "+\t\t\t}\n" "+\t\t\t/* More alarm bits */\n" - "+\t\t\tdata->alarms |+\t\t\t\tlm85_read_value(client, EMC6D100_REG_ALARM3) << 16;\n" + "+\t\t\tdata->alarms |=\n" + "+\t\t\t\tlm85_read_value(client, EMC6D100_REG_ALARM3) << 16;\n" " \t\t}\n" " \n" "-\t\tdata->alarms = lm85_read_value(client, LM85_REG_ALARM1);\n" @@ -179,16 +182,19 @@ " \n" "@@ -1387,6 +1426,15 @@\n" " \t\t\t lm85_read_value(client, LM85_REG_IN_MIN(i));\n" - " \t\t\tdata->in_max[i] \t\t\t lm85_read_value(client, LM85_REG_IN_MAX(i));\n" + " \t\t\tdata->in_max[i] =\n" + " \t\t\t lm85_read_value(client, LM85_REG_IN_MAX(i));\n" "+\t\t}\n" "+\n" - "+\t\tif ( data->type = emc6d100 ) {\n" + "+\t\tif ( data->type == emc6d100 ) {\n" "+\t\t\tfor (i = 5; i <= 7; ++i) {\n" - "+\t\t\t\tdata->in_min[i] +\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN_MIN(i));\n" - "+\t\t\t\tdata->in_max[i] +\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN_MAX(i));\n" + "+\t\t\t\tdata->in_min[i] =\n" + "+\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN_MIN(i));\n" + "+\t\t\t\tdata->in_max[i] =\n" + "+\t\t\t\t\tlm85_read_value(client, EMC6D100_REG_IN_MAX(i));\n" "+\t\t\t}\n" " \t\t}\n" " \n" " \t\tfor (i = 0; i <= 3; ++i) {" -b267591f4d10af6e037fbde178db39c0d7cf0e174cdf48e73836a5201735a011 +83190edf3f7436a4c77829566a16ee98d2129eafa5203c2e1eec2f9691b41654
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.