diff for duplicates of <10548465592184@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d4c76f7..88c0fa5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + + id = i2c_adapter_id(adapter); + -+ if (force_subclients[0] = id && force_subclients[1] = address) { ++ if (force_subclients[0] == id && force_subclients[1] == address) { + for (i = 2; i <= 3; i++) { + if (force_subclients[i] < 0x48 || + force_subclients[i] > 0x4f) { @@ -81,13 +81,13 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + } + + if (kind != w83783s) { -+ if (force_subclients[0] = id && -+ force_subclients[1] = address) { ++ if (force_subclients[0] == id && ++ force_subclients[1] == address) { + data->lm75[1].addr = force_subclients[3]; + } else { + data->lm75[1].addr = 0x48 + ((val1 >> 4) & 0x07); + } -+ if (data->lm75[0].addr = data->lm75[1].addr) { ++ if (data->lm75[0].addr == data->lm75[1].addr) { + dev_err(&new_client->dev, + "Duplicate addresses 0x%x for subclients.\n", + data->lm75[0].addr); @@ -95,15 +95,15 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + } + } + -+ if (kind = w83781d) ++ if (kind == w83781d) + client_name = "W83781D subclient"; -+ else if (kind = w83782d) ++ else if (kind == w83782d) + client_name = "W83782D subclient"; -+ else if (kind = w83783s) ++ else if (kind == w83783s) + client_name = "W83783S subclient"; -+ else if (kind = w83627hf) ++ else if (kind == w83627hf) + client_name = "W83627HF subclient"; -+ else if (kind = as99127f) ++ else if (kind == as99127f) + client_name = "AS99127F subclient"; + else + client_name = "unknown subclient?"; @@ -120,11 +120,11 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + dev_err(&new_client->dev, "Subclient %d " + "registration at address 0x%x " + "failed.\n", i, data->lm75[i].addr); -+ if (i = 1) ++ if (i == 1) + goto ERROR_SC_2; + goto ERROR_SC_1; + } -+ if (kind = w83783s) ++ if (kind == w83783s) + break; + } + @@ -204,8 +204,8 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c - goto ERROR1; + goto ERROR2; /* If Winbond SMBus, check address at 0x48. Asus doesn't support */ - if ((!is_isa) && (((!(val1 & 0x80)) && (val2 = 0xa3)) || - ((val1 & 0x80) && (val2 = 0x5c)))) { + if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || + ((val1 & 0x80) && (val2 == 0x5c)))) { if (w83781d_read_value (new_client, W83781D_REG_I2C_ADDR) != address) - goto ERROR1; @@ -214,13 +214,14 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c } @@ -1144,7 +1240,7 @@ - else if ((val2 = 0x12) || (val2 = 0x06)) + else if ((val2 == 0x12) || (val2 == 0x06)) vendid = asus; else - goto ERROR1; + goto ERROR2; /* mask off lower bit, not reliable */ - val1 w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; + val1 = + w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; @@ -1166,38 +1262,28 @@ "Ignoring 'force' parameter for unknown chip at" "adapter %d, address 0x%02x\n", @@ -230,22 +231,22 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c } } - if (kind = w83781d) { + if (kind == w83781d) { - type_name = "w83781d"; client_name = "W83781D chip"; - } else if (kind = w83782d) { + } else if (kind == w83782d) { - type_name = "w83782d"; client_name = "W83782D chip"; - } else if (kind = w83783s) { + } else if (kind == w83783s) { - type_name = "w83783s"; client_name = "W83783S chip"; - } else if (kind = w83627hf) { + } else if (kind == w83627hf) { - type_name = "w83627hf"; client_name = "W83627HF chip"; - } else if (kind = as99127f) { + } else if (kind == as99127f) { - type_name = "as99127f"; client_name = "AS99127F chip"; - } else if (kind = w83697hf) { + } else if (kind == w83697hf) { - type_name = "w83697hf"; client_name = "W83697HF chip"; } else { @@ -281,7 +282,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c - memset(data->lm75, 0x00, 2 * sizeof (struct i2c_client)); - - id = i2c_adapter_id(adapter); -- if (force_subclients[0] = id && force_subclients[1] = address) { +- if (force_subclients[0] == id && force_subclients[1] == address) { - for (i = 2; i <= 3; i++) { - if (force_subclients[i] < 0x48 || - force_subclients[i] > 0x4f) { @@ -303,28 +304,29 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c - data->lm75[0].addr = 0x48 + (val1 & 0x07); - } - if (kind != w83783s) { -- if (force_subclients[0] = id && -- force_subclients[1] = address) { +- if (force_subclients[0] == id && +- force_subclients[1] == address) { - data->lm75[1].addr = force_subclients[3]; - } else { -- data->lm75[1].addr - 0x48 + ((val1 >> 4) & 0x07); +- data->lm75[1].addr = +- 0x48 + ((val1 >> 4) & 0x07); - } -- if (data->lm75[0].addr = data->lm75[1].addr) { +- if (data->lm75[0].addr == data->lm75[1].addr) { - dev_err(&new_client->dev, - "Duplicate addresses 0x%x for subclients.\n", - data->lm75[0].addr); - goto ERROR5; - } - } -- if (kind = w83781d) +- if (kind == w83781d) - client_name = "W83781D subclient"; -- else if (kind = w83782d) +- else if (kind == w83782d) - client_name = "W83782D subclient"; -- else if (kind = w83783s) +- else if (kind == w83783s) - client_name = "W83783S subclient"; -- else if (kind = w83627hf) +- else if (kind == w83627hf) - client_name = "W83627HF subclient"; -- else if (kind = as99127f) +- else if (kind == as99127f) - client_name = "AS99127F subclient"; - - for (i = 0; i <= 1; i++) { @@ -334,7 +336,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c - data->lm75[i].flags = 0; - strlcpy(data->lm75[i].dev.name, client_name, - DEVICE_NAME_SIZE); -- if (kind = w83783s) +- if (kind == w83783s) - break; - } + if ((err = w83781d_detect_subclients(adapter, address, diff --git a/a/content_digest b/N1/content_digest index b9dbbd4..5b84730 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\020030605205515.GA6846@kroah.com\0" - "ref\01054846559915@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] i2c driver changes for 2.5.70\0" - "Date\0Thu, 19 May 2005 06:23:58 +0000\0" + "Date\0Thu, 5 Jun 2003 13:55:59 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -70,7 +69,7 @@ "+\n" "+\tid = i2c_adapter_id(adapter);\n" "+\n" - "+\tif (force_subclients[0] = id && force_subclients[1] = address) {\n" + "+\tif (force_subclients[0] == id && force_subclients[1] == address) {\n" "+\t\tfor (i = 2; i <= 3; i++) {\n" "+\t\t\tif (force_subclients[i] < 0x48 ||\n" "+\t\t\t force_subclients[i] > 0x4f) {\n" @@ -90,13 +89,13 @@ "+\t}\n" "+\n" "+\tif (kind != w83783s) {\n" - "+\t\tif (force_subclients[0] = id &&\n" - "+\t\t force_subclients[1] = address) {\n" + "+\t\tif (force_subclients[0] == id &&\n" + "+\t\t force_subclients[1] == address) {\n" "+\t\t\tdata->lm75[1].addr = force_subclients[3];\n" "+\t\t} else {\n" "+\t\t\tdata->lm75[1].addr = 0x48 + ((val1 >> 4) & 0x07);\n" "+\t\t}\n" - "+\t\tif (data->lm75[0].addr = data->lm75[1].addr) {\n" + "+\t\tif (data->lm75[0].addr == data->lm75[1].addr) {\n" "+\t\t\tdev_err(&new_client->dev,\n" "+\t\t\t \"Duplicate addresses 0x%x for subclients.\\n\",\n" "+\t\t\t data->lm75[0].addr);\n" @@ -104,15 +103,15 @@ "+\t\t}\n" "+\t}\n" "+\n" - "+\tif (kind = w83781d)\n" + "+\tif (kind == w83781d)\n" "+\t\tclient_name = \"W83781D subclient\";\n" - "+\telse if (kind = w83782d)\n" + "+\telse if (kind == w83782d)\n" "+\t\tclient_name = \"W83782D subclient\";\n" - "+\telse if (kind = w83783s)\n" + "+\telse if (kind == w83783s)\n" "+\t\tclient_name = \"W83783S subclient\";\n" - "+\telse if (kind = w83627hf)\n" + "+\telse if (kind == w83627hf)\n" "+\t\tclient_name = \"W83627HF subclient\";\n" - "+\telse if (kind = as99127f)\n" + "+\telse if (kind == as99127f)\n" "+\t\tclient_name = \"AS99127F subclient\";\n" "+\telse\n" "+\t\tclient_name = \"unknown subclient?\";\n" @@ -129,11 +128,11 @@ "+\t\t\tdev_err(&new_client->dev, \"Subclient %d \"\n" "+\t\t\t\t\"registration at address 0x%x \"\n" "+\t\t\t\t\"failed.\\n\", i, data->lm75[i].addr);\n" - "+\t\t\tif (i = 1)\n" + "+\t\t\tif (i == 1)\n" "+\t\t\t\tgoto ERROR_SC_2;\n" "+\t\t\tgoto ERROR_SC_1;\n" "+\t\t}\n" - "+\t\tif (kind = w83783s)\n" + "+\t\tif (kind == w83783s)\n" "+\t\t\tbreak;\n" "+\t}\n" "+\n" @@ -213,8 +212,8 @@ "-\t\t\tgoto ERROR1;\n" "+\t\t\tgoto ERROR2;\n" " \t\t/* If Winbond SMBus, check address at 0x48. Asus doesn't support */\n" - " \t\tif ((!is_isa) && (((!(val1 & 0x80)) && (val2 = 0xa3)) ||\n" - " \t\t\t\t ((val1 & 0x80) && (val2 = 0x5c)))) {\n" + " \t\tif ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) ||\n" + " \t\t\t\t ((val1 & 0x80) && (val2 == 0x5c)))) {\n" " \t\t\tif (w83781d_read_value\n" " \t\t\t (new_client, W83781D_REG_I2C_ADDR) != address)\n" "-\t\t\t\tgoto ERROR1;\n" @@ -223,13 +222,14 @@ " \t}\n" " \n" "@@ -1144,7 +1240,7 @@\n" - " \t\telse if ((val2 = 0x12) || (val2 = 0x06))\n" + " \t\telse if ((val2 == 0x12) || (val2 == 0x06))\n" " \t\t\tvendid = asus;\n" " \t\telse\n" "-\t\t\tgoto ERROR1;\n" "+\t\t\tgoto ERROR2;\n" " \t\t/* mask off lower bit, not reliable */\n" - " \t\tval1 \t\t w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe;\n" + " \t\tval1 =\n" + " \t\t w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe;\n" "@@ -1166,38 +1262,28 @@\n" " \t\t\t\t \"Ignoring 'force' parameter for unknown chip at\"\n" " \t\t\t\t \"adapter %d, address 0x%02x\\n\",\n" @@ -239,22 +239,22 @@ " \t\t}\n" " \t}\n" " \n" - " \tif (kind = w83781d) {\n" + " \tif (kind == w83781d) {\n" "-\t\ttype_name = \"w83781d\";\n" " \t\tclient_name = \"W83781D chip\";\n" - " \t} else if (kind = w83782d) {\n" + " \t} else if (kind == w83782d) {\n" "-\t\ttype_name = \"w83782d\";\n" " \t\tclient_name = \"W83782D chip\";\n" - " \t} else if (kind = w83783s) {\n" + " \t} else if (kind == w83783s) {\n" "-\t\ttype_name = \"w83783s\";\n" " \t\tclient_name = \"W83783S chip\";\n" - " \t} else if (kind = w83627hf) {\n" + " \t} else if (kind == w83627hf) {\n" "-\t\ttype_name = \"w83627hf\";\n" " \t\tclient_name = \"W83627HF chip\";\n" - " \t} else if (kind = as99127f) {\n" + " \t} else if (kind == as99127f) {\n" "-\t\ttype_name = \"as99127f\";\n" " \t\tclient_name = \"AS99127F chip\";\n" - " \t} else if (kind = w83697hf) {\n" + " \t} else if (kind == w83697hf) {\n" "-\t\ttype_name = \"w83697hf\";\n" " \t\tclient_name = \"W83697HF chip\";\n" " \t} else {\n" @@ -290,7 +290,7 @@ "-\t\tmemset(data->lm75, 0x00, 2 * sizeof (struct i2c_client));\n" "-\n" "-\t\tid = i2c_adapter_id(adapter);\n" - "-\t\tif (force_subclients[0] = id && force_subclients[1] = address) {\n" + "-\t\tif (force_subclients[0] == id && force_subclients[1] == address) {\n" "-\t\t\tfor (i = 2; i <= 3; i++) {\n" "-\t\t\t\tif (force_subclients[i] < 0x48 ||\n" "-\t\t\t\t force_subclients[i] > 0x4f) {\n" @@ -312,28 +312,29 @@ "-\t\t\tdata->lm75[0].addr = 0x48 + (val1 & 0x07);\n" "-\t\t}\n" "-\t\tif (kind != w83783s) {\n" - "-\t\t\tif (force_subclients[0] = id &&\n" - "-\t\t\t force_subclients[1] = address) {\n" + "-\t\t\tif (force_subclients[0] == id &&\n" + "-\t\t\t force_subclients[1] == address) {\n" "-\t\t\t\tdata->lm75[1].addr = force_subclients[3];\n" "-\t\t\t} else {\n" - "-\t\t\t\tdata->lm75[1].addr -\t\t\t\t 0x48 + ((val1 >> 4) & 0x07);\n" + "-\t\t\t\tdata->lm75[1].addr =\n" + "-\t\t\t\t 0x48 + ((val1 >> 4) & 0x07);\n" "-\t\t\t}\n" - "-\t\t\tif (data->lm75[0].addr = data->lm75[1].addr) {\n" + "-\t\t\tif (data->lm75[0].addr == data->lm75[1].addr) {\n" "-\t\t\t\tdev_err(&new_client->dev,\n" "-\t\t\t\t \"Duplicate addresses 0x%x for subclients.\\n\",\n" "-\t\t\t\t data->lm75[0].addr);\n" "-\t\t\t\tgoto ERROR5;\n" "-\t\t\t}\n" "-\t\t}\n" - "-\t\tif (kind = w83781d)\n" + "-\t\tif (kind == w83781d)\n" "-\t\t\tclient_name = \"W83781D subclient\";\n" - "-\t\telse if (kind = w83782d)\n" + "-\t\telse if (kind == w83782d)\n" "-\t\t\tclient_name = \"W83782D subclient\";\n" - "-\t\telse if (kind = w83783s)\n" + "-\t\telse if (kind == w83783s)\n" "-\t\t\tclient_name = \"W83783S subclient\";\n" - "-\t\telse if (kind = w83627hf)\n" + "-\t\telse if (kind == w83627hf)\n" "-\t\t\tclient_name = \"W83627HF subclient\";\n" - "-\t\telse if (kind = as99127f)\n" + "-\t\telse if (kind == as99127f)\n" "-\t\t\tclient_name = \"AS99127F subclient\";\n" "-\n" "-\t\tfor (i = 0; i <= 1; i++) {\n" @@ -343,7 +344,7 @@ "-\t\t\tdata->lm75[i].flags = 0;\n" "-\t\t\tstrlcpy(data->lm75[i].dev.name, client_name,\n" "-\t\t\t\tDEVICE_NAME_SIZE);\n" - "-\t\t\tif (kind = w83783s)\n" + "-\t\t\tif (kind == w83783s)\n" "-\t\t\t\tbreak;\n" "-\t\t}\n" "+\t\tif ((err = w83781d_detect_subclients(adapter, address,\n" @@ -412,4 +413,4 @@ " \n" " \treturn 0;" -d30719e87f8ae9353d19ea51a9099abd7bf737659df3c2f35e72012ad9908e43 +04271fb488b85f3cecb53b55bc7330aa36be1afd2ddb74ab5881cd1d722b2a9c
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.