diff for duplicates of <20050719235754.487f4bf1.khali@linux-fr.org> diff --git a/a/1.txt b/N1/1.txt index 55e993d..007e1c3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,8 @@ with that in a later patchset. int addr, i, found, j, err; struct i2c_force_data *this_force; - int is_isa = i2c_is_isa_adapter(adapter); -- int adapter_id - is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); +- int adapter_id = +- is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); + int adapter_id = i2c_adapter_id(adapter); unsigned short *normal_i2c; - unsigned int *normal_isa; @@ -60,20 +61,20 @@ with that in a later patchset. @@ -69,7 +61,7 @@ for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) { for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) { - if ( ((adapter_id = this_force->force[j]) || -- ((this_force->force[j] = ANY_I2C_BUS) && !is_isa)) && -+ (this_force->force[j] = ANY_I2C_BUS)) && - (addr = this_force->force[j + 1]) ) { + if ( ((adapter_id == this_force->force[j]) || +- ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) && ++ (this_force->force[j] == ANY_I2C_BUS)) && + (addr == this_force->force[j + 1]) ) { dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr); if ((err = found_proc(adapter, addr, this_force->kind))) @@ -85,8 +77,7 @@ right now */ for (i = 0; !found && (ignore[i] != I2C_CLIENT_END); i += 2) { - if ( ((adapter_id = ignore[i]) || -- ((ignore[i] = ANY_I2C_BUS) && + if ( ((adapter_id == ignore[i]) || +- ((ignore[i] == ANY_I2C_BUS) && - !is_isa)) && -+ (ignore[i] = ANY_I2C_BUS)) && - (addr = ignore[i + 1])) { ++ (ignore[i] == ANY_I2C_BUS)) && + (addr == ignore[i + 1])) { dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; @@ -97,19 +88,10 @@ @@ -82,19 +83,19 @@ with that in a later patchset. probe entries */ - if (is_isa) { - for (i = 0; !found && (normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) { -- if (addr = normal_isa[i]) { +- if (addr == normal_isa[i]) { - dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr); - found = 1; - } - } - } else { - for (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) { -- if (addr = normal_i2c[i]) { +- if (addr == normal_i2c[i]) { - found = 1; - dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x\n", adapter_id, addr); - } + for (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) { -+ if (addr = normal_i2c[i]) { ++ if (addr == normal_i2c[i]) { + found = 1; + dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x\n", adapter_id, addr); } @@ -103,10 +104,10 @@ with that in a later patchset. @@ -117,7 +99,7 @@ !found && (probe[i] != I2C_CLIENT_END); i += 2) { - if (((adapter_id = probe[i]) || -- ((probe[i] = ANY_I2C_BUS) && !is_isa)) -+ (probe[i] = ANY_I2C_BUS)) - && (addr = probe[i + 1])) { + if (((adapter_id == probe[i]) || +- ((probe[i] == ANY_I2C_BUS) && !is_isa)) ++ (probe[i] == ANY_I2C_BUS)) + && (addr == probe[i + 1])) { dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; @@ -128,8 +110,7 @@ diff --git a/a/content_digest b/N1/content_digest index ccfe20f..f244ba4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050719233902.40282559.khali@linux-fr.org\0" - "From\0khali@linux-fr.org (Jean Delvare)\0" - "Subject\0[lm-sensors] [PATCH 2.6] I2C: Separate non-i2c hwmon drivers from\0" - "Date\0Tue, 19 Jul 2005 23:58:18 +0000\0" + "From\0Jean Delvare <khali@linux-fr.org>\0" + "Subject\0[PATCH 2.6] I2C: Separate non-i2c hwmon drivers from i2c-core (6/9)\0" + "Date\0Tue, 19 Jul 2005 23:57:54 +0200\0" "To\0LKML <linux-kernel@vger.kernel.org>" " LM Sensors <lm-sensors@lm-sensors.org>\0" "Cc\0Greg KH <greg@kroah.com>\0" @@ -34,7 +34,8 @@ " \tint addr, i, found, j, err;\n" " \tstruct i2c_force_data *this_force;\n" "-\tint is_isa = i2c_is_isa_adapter(adapter);\n" - "-\tint adapter_id -\t is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);\n" + "-\tint adapter_id =\n" + "-\t is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);\n" "+\tint adapter_id = i2c_adapter_id(adapter);\n" " \tunsigned short *normal_i2c;\n" "-\tunsigned int *normal_isa;\n" @@ -69,20 +70,20 @@ "@@ -69,7 +61,7 @@\n" " \t\tfor (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) {\n" " \t\t\tfor (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) {\n" - " \t\t\t\tif ( ((adapter_id = this_force->force[j]) ||\n" - "-\t\t\t\t ((this_force->force[j] = ANY_I2C_BUS) && !is_isa)) &&\n" - "+\t\t\t\t (this_force->force[j] = ANY_I2C_BUS)) &&\n" - " \t\t\t\t (addr = this_force->force[j + 1]) ) {\n" + " \t\t\t\tif ( ((adapter_id == this_force->force[j]) ||\n" + "-\t\t\t\t ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) &&\n" + "+\t\t\t\t (this_force->force[j] == ANY_I2C_BUS)) &&\n" + " \t\t\t\t (addr == this_force->force[j + 1]) ) {\n" " \t\t\t\t\tdev_dbg(&adapter->dev, \"found force parameter for adapter %d, addr %04x\\n\", adapter_id, addr);\n" " \t\t\t\t\tif ((err = found_proc(adapter, addr, this_force->kind)))\n" "@@ -85,8 +77,7 @@\n" " \t\t right now */\n" " \t\tfor (i = 0; !found && (ignore[i] != I2C_CLIENT_END); i += 2) {\n" - " \t\t\tif ( ((adapter_id = ignore[i]) ||\n" - "-\t\t\t ((ignore[i] = ANY_I2C_BUS) &&\n" + " \t\t\tif ( ((adapter_id == ignore[i]) ||\n" + "-\t\t\t ((ignore[i] == ANY_I2C_BUS) &&\n" "-\t\t\t !is_isa)) &&\n" - "+\t\t\t (ignore[i] = ANY_I2C_BUS)) &&\n" - " \t\t\t (addr = ignore[i + 1])) {\n" + "+\t\t\t (ignore[i] == ANY_I2C_BUS)) &&\n" + " \t\t\t (addr == ignore[i + 1])) {\n" " \t\t\t\tdev_dbg(&adapter->dev, \"found ignore parameter for adapter %d, addr %04x\\n\", adapter_id, addr);\n" " \t\t\t\tfound = 1;\n" "@@ -97,19 +88,10 @@\n" @@ -91,19 +92,19 @@ " \t\t probe entries */\n" "-\t\tif (is_isa) {\n" "-\t\t\tfor (i = 0; !found && (normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) {\n" - "-\t\t\t\tif (addr = normal_isa[i]) {\n" + "-\t\t\t\tif (addr == normal_isa[i]) {\n" "-\t\t\t\t\tdev_dbg(&adapter->dev, \"found normal isa entry for adapter %d, addr %04x\\n\", adapter_id, addr);\n" "-\t\t\t\t\tfound = 1;\n" "-\t\t\t\t}\n" "-\t\t\t}\n" "-\t\t} else {\n" "-\t\t\tfor (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) {\n" - "-\t\t\t\tif (addr = normal_i2c[i]) {\n" + "-\t\t\t\tif (addr == normal_i2c[i]) {\n" "-\t\t\t\t\tfound = 1;\n" "-\t\t\t\t\tdev_dbg(&adapter->dev, \"found normal i2c entry for adapter %d, addr %02x\\n\", adapter_id, addr);\n" "-\t\t\t\t}\n" "+\t\tfor (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) {\n" - "+\t\t\tif (addr = normal_i2c[i]) {\n" + "+\t\t\tif (addr == normal_i2c[i]) {\n" "+\t\t\t\tfound = 1;\n" "+\t\t\t\tdev_dbg(&adapter->dev, \"found normal i2c entry for adapter %d, addr %02x\\n\", adapter_id, addr);\n" " \t\t\t}\n" @@ -112,10 +113,10 @@ "@@ -117,7 +99,7 @@\n" " \t\t !found && (probe[i] != I2C_CLIENT_END);\n" " \t\t i += 2) {\n" - " \t\t\tif (((adapter_id = probe[i]) ||\n" - "-\t\t\t ((probe[i] = ANY_I2C_BUS) && !is_isa))\n" - "+\t\t\t (probe[i] = ANY_I2C_BUS))\n" - " \t\t\t && (addr = probe[i + 1])) {\n" + " \t\t\tif (((adapter_id == probe[i]) ||\n" + "-\t\t\t ((probe[i] == ANY_I2C_BUS) && !is_isa))\n" + "+\t\t\t (probe[i] == ANY_I2C_BUS))\n" + " \t\t\t && (addr == probe[i + 1])) {\n" " \t\t\t\tdev_dbg(&adapter->dev, \"found probe parameter for adapter %d, addr %04x\\n\", adapter_id, addr);\n" " \t\t\t\tfound = 1;\n" "@@ -128,8 +110,7 @@\n" @@ -133,4 +134,4 @@ "-- \n" Jean Delvare -782e85d63ace2c93d560a42cacc63d19bd796dd8ad6fdd8a386c4e6e19919301 +e0b35462363e7208f6e845e38f8e2c5585b51101c8e1ac8bb814f9f09f479734
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.