diff for duplicates of <10512287472152@kroah.com> diff --git a/a/1.txt b/N1/1.txt index f98de50..2b358b1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -117,7 +117,8 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c @@ -42,7 +42,7 @@ struct i2c_force_data *this_force; int is_isa = i2c_is_isa_adapter(adapter); - int adapter_id - is_isa ? SENSORS_ISA_BUS : i2c_adapter_id(adapter); + int adapter_id = +- is_isa ? SENSORS_ISA_BUS : i2c_adapter_id(adapter); + is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter); /* Forget it if we can't probe using SMBUS_QUICK */ @@ -128,10 +129,10 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) { - for (j = 0; !found && (this_force->force[j] != SENSORS_I2C_END); j += 2) { + for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) { - if ( ((adapter_id = this_force->force[j]) || -- ((this_force->force[j] = SENSORS_ANY_I2C_BUS) && !is_isa)) && -+ ((this_force->force[j] = ANY_I2C_BUS) && !is_isa)) && - (addr = this_force->force[j + 1]) ) { + if ( ((adapter_id == this_force->force[j]) || +- ((this_force->force[j] == SENSORS_ANY_I2C_BUS) && !is_isa)) && ++ ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) && + (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))) @@ -75,18 +75,18 @@ @@ -140,20 +141,20 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c right now */ - for (i = 0; !found && (address_data->ignore[i] != SENSORS_I2C_END); i += 2) { + for (i = 0; !found && (address_data->ignore[i] != I2C_CLIENT_END); i += 2) { - if ( ((adapter_id = address_data->ignore[i]) || -- ((address_data->ignore[i] = SENSORS_ANY_I2C_BUS) && -+ ((address_data->ignore[i] = ANY_I2C_BUS) && + if ( ((adapter_id == address_data->ignore[i]) || +- ((address_data->ignore[i] == SENSORS_ANY_I2C_BUS) && ++ ((address_data->ignore[i] == ANY_I2C_BUS) && !is_isa)) && - (addr = address_data->ignore[i + 1])) { + (addr == address_data->ignore[i + 1])) { dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } } - for (i = 0; !found && (address_data->ignore_range[i] != SENSORS_I2C_END); i += 3) { + for (i = 0; !found && (address_data->ignore_range[i] != I2C_CLIENT_END); i += 3) { - if ( ((adapter_id = address_data->ignore_range[i]) || -- ((address_data-> ignore_range[i] = SENSORS_ANY_I2C_BUS) & -+ ((address_data-> ignore_range[i] = ANY_I2C_BUS) & + if ( ((adapter_id == address_data->ignore_range[i]) || +- ((address_data-> ignore_range[i] == SENSORS_ANY_I2C_BUS) & ++ ((address_data-> ignore_range[i] == ANY_I2C_BUS) & !is_isa)) && (addr >= address_data->ignore_range[i + 1]) && (addr <= address_data->ignore_range[i + 2])) { @@ -163,7 +164,7 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c if (is_isa) { - for (i = 0; !found && (address_data->normal_isa[i] != SENSORS_ISA_END); i += 1) { + for (i = 0; !found && (address_data->normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) { - if (addr = address_data->normal_isa[i]) { + if (addr == address_data->normal_isa[i]) { dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } @@ -172,14 +173,14 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c + for (i = 0; !found && (address_data->normal_isa_range[i] != I2C_CLIENT_ISA_END); i += 3) { if ((addr >= address_data->normal_isa_range[i]) && (addr <= address_data->normal_isa_range[i + 1]) && - ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] = 0)) { + ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] == 0)) { @@ -115,13 +115,13 @@ } } } else { - for (i = 0; !found && (address_data->normal_i2c[i] != SENSORS_I2C_END); i += 1) { + for (i = 0; !found && (address_data->normal_i2c[i] != I2C_CLIENT_END); i += 1) { - if (addr = address_data->normal_i2c[i]) { + if (addr == address_data->normal_i2c[i]) { found = 1; dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x", adapter_id, addr); } @@ -196,20 +197,20 @@ diff -Nru a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c - !found && (address_data->probe[i] != SENSORS_I2C_END); + !found && (address_data->probe[i] != I2C_CLIENT_END); i += 2) { - if (((adapter_id = address_data->probe[i]) || + if (((adapter_id == address_data->probe[i]) || ((address_data-> -- probe[i] = SENSORS_ANY_I2C_BUS) & !is_isa)) -+ probe[i] = ANY_I2C_BUS) & !is_isa)) - && (addr = address_data->probe[i + 1])) { +- probe[i] == SENSORS_ANY_I2C_BUS) & !is_isa)) ++ probe[i] == ANY_I2C_BUS) & !is_isa)) + && (addr == address_data->probe[i + 1])) { dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr); found = 1; } } - for (i = 0; !found && (address_data->probe_range[i] != SENSORS_I2C_END); i += 3) { + for (i = 0; !found && (address_data->probe_range[i] != I2C_CLIENT_END); i += 3) { - if ( ((adapter_id = address_data->probe_range[i]) || -- ((address_data->probe_range[i] = SENSORS_ANY_I2C_BUS) & !is_isa)) && -+ ((address_data->probe_range[i] = ANY_I2C_BUS) & !is_isa)) && + if ( ((adapter_id == address_data->probe_range[i]) || +- ((address_data->probe_range[i] == SENSORS_ANY_I2C_BUS) & !is_isa)) && ++ ((address_data->probe_range[i] == ANY_I2C_BUS) & !is_isa)) && (addr >= address_data->probe_range[i + 1]) && (addr <= address_data->probe_range[i + 2])) { found = 1; diff --git a/a/content_digest b/N1/content_digest index e0aa801..f7c69a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010512287472218@kroah.com\0" - "ref\010512287461373@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.68\0" - "Date\0Thu, 19 May 2005 06:23:54 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.68\0" + "Date\0Thu, 24 Apr 2003 16:59:07 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -126,7 +125,8 @@ "@@ -42,7 +42,7 @@\n" " \tstruct i2c_force_data *this_force;\n" " \tint is_isa = i2c_is_isa_adapter(adapter);\n" - " \tint adapter_id -\t is_isa ? SENSORS_ISA_BUS : i2c_adapter_id(adapter);\n" + " \tint adapter_id =\n" + "-\t is_isa ? SENSORS_ISA_BUS : i2c_adapter_id(adapter);\n" "+\t is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);\n" " \n" " \t/* Forget it if we can't probe using SMBUS_QUICK */\n" @@ -137,10 +137,10 @@ " \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] != SENSORS_I2C_END); j += 2) {\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] = SENSORS_ANY_I2C_BUS) && !is_isa)) &&\n" - "+\t\t\t\t ((this_force->force[j] = ANY_I2C_BUS) && !is_isa)) &&\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] == SENSORS_ANY_I2C_BUS) && !is_isa)) &&\n" + "+\t\t\t\t ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) &&\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" "@@ -75,18 +75,18 @@\n" @@ -149,20 +149,20 @@ " \t\t right now */\n" "-\t\tfor (i = 0; !found && (address_data->ignore[i] != SENSORS_I2C_END); i += 2) {\n" "+\t\tfor (i = 0; !found && (address_data->ignore[i] != I2C_CLIENT_END); i += 2) {\n" - " \t\t\tif ( ((adapter_id = address_data->ignore[i]) ||\n" - "-\t\t\t ((address_data->ignore[i] = SENSORS_ANY_I2C_BUS) &&\n" - "+\t\t\t ((address_data->ignore[i] = ANY_I2C_BUS) &&\n" + " \t\t\tif ( ((adapter_id == address_data->ignore[i]) ||\n" + "-\t\t\t ((address_data->ignore[i] == SENSORS_ANY_I2C_BUS) &&\n" + "+\t\t\t ((address_data->ignore[i] == ANY_I2C_BUS) &&\n" " \t\t\t !is_isa)) &&\n" - " \t\t\t (addr = address_data->ignore[i + 1])) {\n" + " \t\t\t (addr == address_data->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" " \t\t\t}\n" " \t\t}\n" "-\t\tfor (i = 0; !found && (address_data->ignore_range[i] != SENSORS_I2C_END); i += 3) {\n" "+\t\tfor (i = 0; !found && (address_data->ignore_range[i] != I2C_CLIENT_END); i += 3) {\n" - " \t\t\tif ( ((adapter_id = address_data->ignore_range[i]) ||\n" - "-\t\t\t ((address_data-> ignore_range[i] = SENSORS_ANY_I2C_BUS) & \n" - "+\t\t\t ((address_data-> ignore_range[i] = ANY_I2C_BUS) & \n" + " \t\t\tif ( ((adapter_id == address_data->ignore_range[i]) ||\n" + "-\t\t\t ((address_data-> ignore_range[i] == SENSORS_ANY_I2C_BUS) & \n" + "+\t\t\t ((address_data-> ignore_range[i] == ANY_I2C_BUS) & \n" " \t\t\t !is_isa)) &&\n" " \t\t\t (addr >= address_data->ignore_range[i + 1]) &&\n" " \t\t\t (addr <= address_data->ignore_range[i + 2])) {\n" @@ -172,7 +172,7 @@ " \t\tif (is_isa) {\n" "-\t\t\tfor (i = 0; !found && (address_data->normal_isa[i] != SENSORS_ISA_END); i += 1) {\n" "+\t\t\tfor (i = 0; !found && (address_data->normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) {\n" - " \t\t\t\tif (addr = address_data->normal_isa[i]) {\n" + " \t\t\t\tif (addr == address_data->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" @@ -181,14 +181,14 @@ "+\t\t\tfor (i = 0; !found && (address_data->normal_isa_range[i] != I2C_CLIENT_ISA_END); i += 3) {\n" " \t\t\t\tif ((addr >= address_data->normal_isa_range[i]) &&\n" " \t\t\t\t (addr <= address_data->normal_isa_range[i + 1]) &&\n" - " \t\t\t\t ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] = 0)) {\n" + " \t\t\t\t ((addr - address_data->normal_isa_range[i]) % address_data->normal_isa_range[i + 2] == 0)) {\n" "@@ -115,13 +115,13 @@\n" " \t\t\t\t}\n" " \t\t\t}\n" " \t\t} else {\n" "-\t\t\tfor (i = 0; !found && (address_data->normal_i2c[i] != SENSORS_I2C_END); i += 1) {\n" "+\t\t\tfor (i = 0; !found && (address_data->normal_i2c[i] != I2C_CLIENT_END); i += 1) {\n" - " \t\t\t\tif (addr = address_data->normal_i2c[i]) {\n" + " \t\t\t\tif (addr == address_data->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\", adapter_id, addr);\n" " \t\t\t\t}\n" @@ -205,20 +205,20 @@ "-\t\t !found && (address_data->probe[i] != SENSORS_I2C_END);\n" "+\t\t !found && (address_data->probe[i] != I2C_CLIENT_END);\n" " \t\t i += 2) {\n" - " \t\t\tif (((adapter_id = address_data->probe[i]) ||\n" + " \t\t\tif (((adapter_id == address_data->probe[i]) ||\n" " \t\t\t ((address_data->\n" - "-\t\t\t probe[i] = SENSORS_ANY_I2C_BUS) & !is_isa))\n" - "+\t\t\t probe[i] = ANY_I2C_BUS) & !is_isa))\n" - " \t\t\t && (addr = address_data->probe[i + 1])) {\n" + "-\t\t\t probe[i] == SENSORS_ANY_I2C_BUS) & !is_isa))\n" + "+\t\t\t probe[i] == ANY_I2C_BUS) & !is_isa))\n" + " \t\t\t && (addr == address_data->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" " \t\t\t}\n" " \t\t}\n" "-\t\tfor (i = 0; !found && (address_data->probe_range[i] != SENSORS_I2C_END); i += 3) {\n" "+\t\tfor (i = 0; !found && (address_data->probe_range[i] != I2C_CLIENT_END); i += 3) {\n" - " \t\t\tif ( ((adapter_id = address_data->probe_range[i]) ||\n" - "-\t\t\t ((address_data->probe_range[i] = SENSORS_ANY_I2C_BUS) & !is_isa)) &&\n" - "+\t\t\t ((address_data->probe_range[i] = ANY_I2C_BUS) & !is_isa)) &&\n" + " \t\t\tif ( ((adapter_id == address_data->probe_range[i]) ||\n" + "-\t\t\t ((address_data->probe_range[i] == SENSORS_ANY_I2C_BUS) & !is_isa)) &&\n" + "+\t\t\t ((address_data->probe_range[i] == ANY_I2C_BUS) & !is_isa)) &&\n" " \t\t\t (addr >= address_data->probe_range[i + 1]) &&\n" " \t\t\t (addr <= address_data->probe_range[i + 2])) {\n" " \t\t\t\tfound = 1;\n" @@ -494,4 +494,4 @@ " /* Detect whether we are on the isa bus. If this returns true, all i2c\n" access will fail! */ -90da23180314c1c7c1f6ee3e660868812c05561608be8852e7e892da44b723f0 +c0d121963f66845d414457ad712f20888338174f6e299c60ee52b1c1650ab361
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.