diff for duplicates of <10752464532256@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 1f82007..5a282b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,30 +39,30 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + dev_dbg(&adapter->dev, "Autodetecting device at %d,0x%02x ...\n", i2c_adapter_id(adapter), address ); - } - if( company = LM85_COMPANY_NATIONAL - && verstep = LM85_VERSTEP_LM85C ) { + if( company == LM85_COMPANY_NATIONAL + && verstep == LM85_VERSTEP_LM85C ) { kind = lm85c ; @@ -823,8 +816,8 @@ kind = lm85b ; - } else if( company = LM85_COMPANY_NATIONAL - && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { + } else if( company == LM85_COMPANY_NATIONAL + && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { - printk("lm85: Unrecgonized version/stepping 0x%02x" - " Defaulting to LM85.\n", verstep ); + dev_err(&adapter->dev, "Unrecgonized version/stepping 0x%02x" + " Defaulting to LM85.\n", verstep); kind = any_chip ; - } else if( company = LM85_COMPANY_ANALOG_DEV - && verstep = LM85_VERSTEP_ADM1027 ) { + } else if( company == LM85_COMPANY_ANALOG_DEV + && verstep == LM85_VERSTEP_ADM1027 ) { @@ -834,21 +827,19 @@ kind = adt7463 ; - } else if( company = LM85_COMPANY_ANALOG_DEV - && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { + } else if( company == LM85_COMPANY_ANALOG_DEV + && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { - printk("lm85: Unrecgonized version/stepping 0x%02x" - " Defaulting to ADM1027.\n", verstep ); + dev_err(&adapter->dev, "Unrecgonized 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) { - printk("lm85: Generic LM85 Version 6 detected\n"); + dev_err(&adapter->dev, "Generic LM85 Version 6 detected\n"); /* Leave kind as "any_chip" */ @@ -72,7 +72,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c - } + dev_dbg(&adapter->dev, "Autodetection failed\n"); /* Not an LM85 ... */ - if( kind = 0 ) { /* User used force=x,y */ + if( kind == 0 ) { /* User used force=x,y */ - printk("lm85: Generic LM85 Version 6 not" - " found at %d,0x%02x. Try force_lm85c.\n", - i2c_adapter_id(adapter), address ); @@ -124,8 +124,8 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c i2c_adapter_id(client->adapter), client->addr ); }; if( value & 0x10 - && ( data->type = adm1027 - || data->type = adt7463 ) ) { + && ( data->type == adm1027 + || data->type == adt7463 ) ) { - printk("lm85(%d): Client (%d,0x%02x) VxI mode is set. " + dev_err(&client->dev, "Client (%d,0x%02x) VxI mode is set. " "Please report this to the lm85 maintainer.\n", @@ -169,7 +169,8 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c - printk("lm85(%d): Reading config values\n", client->id); - } for (i = 0; i <= 4; ++i) { - data->in_min[i] lm85_read_value(client, LM85_REG_IN_MIN(i)); + data->in_min[i] = + lm85_read_value(client, LM85_REG_IN_MIN(i)); @@ -1234,8 +1209,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Philip Pokorny <ppokorny@penguincomputing.com>, Margit Schubert-While <margitsw@t-online.de>"); diff --git a/a/content_digest b/N1/content_digest index 3c37cda..65df946 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01075246453781@kroah.com\0" - "ref\010752464532280@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.2-rc2\0" - "Date\0Thu, 19 May 2005 06:24:37 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.2-rc2\0" + "Date\0Tue, 27 Jan 2004 15:34:13 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -48,30 +47,30 @@ "+\t\tdev_dbg(&adapter->dev, \"Autodetecting device at %d,0x%02x ...\\n\",\n" " \t\t\ti2c_adapter_id(adapter), address );\n" "-\t\t}\n" - " \t\tif( company = LM85_COMPANY_NATIONAL\n" - " \t\t && verstep = LM85_VERSTEP_LM85C ) {\n" + " \t\tif( company == LM85_COMPANY_NATIONAL\n" + " \t\t && verstep == LM85_VERSTEP_LM85C ) {\n" " \t\t\tkind = lm85c ;\n" "@@ -823,8 +816,8 @@\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} else if( company == LM85_COMPANY_NATIONAL\n" + " \t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" "-\t\t\tprintk(\"lm85: Unrecgonized version/stepping 0x%02x\"\n" "-\t\t\t \" Defaulting to LM85.\\n\", verstep );\n" "+\t\t\tdev_err(&adapter->dev, \"Unrecgonized version/stepping 0x%02x\"\n" "+\t\t\t\t\" Defaulting to LM85.\\n\", verstep);\n" " \t\t\tkind = any_chip ;\n" - " \t\t} else if( company = LM85_COMPANY_ANALOG_DEV\n" - " \t\t && verstep = LM85_VERSTEP_ADM1027 ) {\n" + " \t\t} else if( company == LM85_COMPANY_ANALOG_DEV\n" + " \t\t && verstep == LM85_VERSTEP_ADM1027 ) {\n" "@@ -834,21 +827,19 @@\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} else if( company == LM85_COMPANY_ANALOG_DEV\n" + " \t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" "-\t\t\tprintk(\"lm85: Unrecgonized version/stepping 0x%02x\"\n" "-\t\t\t \" Defaulting to ADM1027.\\n\", verstep );\n" "+\t\t\tdev_err(&adapter->dev, \"Unrecgonized 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\tprintk(\"lm85: Generic LM85 Version 6 detected\\n\");\n" "+\t\t\tdev_err(&adapter->dev, \"Generic LM85 Version 6 detected\\n\");\n" " \t\t\t/* Leave kind as \"any_chip\" */\n" @@ -81,7 +80,7 @@ "-\t\t\t}\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 == 0 ) { /* User used force=x,y */\n" "-\t\t\t printk(\"lm85: Generic LM85 Version 6 not\"\n" "-\t\t\t\t\" found at %d,0x%02x. Try force_lm85c.\\n\",\n" "-\t\t\t\ti2c_adapter_id(adapter), address );\n" @@ -133,8 +132,8 @@ " \t\t\t i2c_adapter_id(client->adapter), client->addr );\n" " \t};\n" " \tif( value & 0x10\n" - " \t && ( data->type = adm1027\n" - " \t\t|| data->type = adt7463 ) ) {\n" + " \t && ( data->type == adm1027\n" + " \t\t|| data->type == adt7463 ) ) {\n" "-\t\tprintk(\"lm85(%d): Client (%d,0x%02x) VxI mode is set. \"\n" "+\t\tdev_err(&client->dev, \"Client (%d,0x%02x) VxI mode is set. \"\n" " \t\t\t\"Please report this to the lm85 maintainer.\\n\",\n" @@ -178,7 +177,8 @@ "-\t\t\tprintk(\"lm85(%d): Reading config values\\n\", client->id);\n" "-\t\t}\n" " \t\tfor (i = 0; i <= 4; ++i) {\n" - " \t\t\tdata->in_min[i] \t\t\t lm85_read_value(client, LM85_REG_IN_MIN(i));\n" + " \t\t\tdata->in_min[i] =\n" + " \t\t\t lm85_read_value(client, LM85_REG_IN_MIN(i));\n" "@@ -1234,8 +1209,6 @@\n" " MODULE_LICENSE(\"GPL\");\n" " MODULE_AUTHOR(\"Philip Pokorny <ppokorny@penguincomputing.com>, Margit Schubert-While <margitsw@t-online.de>\");\n" @@ -189,4 +189,4 @@ " module_init(sm_lm85_init);\n" module_exit(sm_lm85_exit); -f3b138d3d0158f9808b0e52a77bebbdf16edcf29189338b63b82f88cb86e5f55 +d5110b4e94c41b91c304525e22cadcc3126f6dfd67b7ed2484427fe622ff519a
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.