diff for duplicates of <1058630094923@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 8099275..d946524 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -217,7 +217,7 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + int timeout = 0; + int i; + -+ protocol = (read_write = I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ : ++ protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ : + NVIDIA_SMB_PRTCL_WRITE; + pec = (flags & I2C_CLIENT_PEC) ? NVIDIA_SMB_PRTCL_PEC : 0; + @@ -229,21 +229,21 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + break; + + case I2C_SMBUS_BYTE: -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(data->byte, NVIDIA_SMB_DATA); + protocol |= NVIDIA_SMB_PRTCL_BYTE; + break; + + case I2C_SMBUS_BYTE_DATA: + outb_p(command, NVIDIA_SMB_CMD); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(data->byte, NVIDIA_SMB_DATA); + protocol |= NVIDIA_SMB_PRTCL_BYTE_DATA; + break; + + case I2C_SMBUS_WORD_DATA: + outb_p(command, NVIDIA_SMB_CMD); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + outb_p(data->word, NVIDIA_SMB_DATA); + outb_p(data->word >> 8, NVIDIA_SMB_DATA+1); + } @@ -252,7 +252,7 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + + case I2C_SMBUS_BLOCK_DATA: + outb_p(command, NVIDIA_SMB_CMD); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + len = min_t(u8, data->block[0], 32); + outb_p(len, NVIDIA_SMB_BCNT); + for (i = 0; i < len; i++) @@ -265,7 +265,7 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + len = min_t(u8, data->block[0], 32); + outb_p(command, NVIDIA_SMB_CMD); + outb_p(len, NVIDIA_SMB_BCNT); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + for (i = 0; i < len; i++) + outb_p(data->block[i + 1], NVIDIA_SMB_DATA+i); + protocol |= NVIDIA_SMB_PRTCL_I2C_BLOCK_DATA; @@ -319,7 +319,7 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + do { + nforce2_do_pause(1); + temp = inb_p(NVIDIA_SMB_STS); -+ } while (((temp & NVIDIA_SMB_STS_DONE) = 0) && (timeout++ < MAX_TIMEOUT)); ++ } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT)); +#endif + if (~temp & NVIDIA_SMB_STS_DONE) { + udelay(500); @@ -335,7 +335,7 @@ diff -Nru a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c + || (temp & NVIDIA_SMB_STS_STATUS)) + return -1; + -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + return 0; + + switch (size) { diff --git a/a/content_digest b/N1/content_digest index 05e1c54..26fc2c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010586300933079@kroah.com\0" - "ref\0105863009030@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes 2.6.0-test1\0" - "Date\0Thu, 19 May 2005 06:24:06 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes 2.6.0-test1\0" + "Date\0Sat, 19 Jul 2003 08:54:54 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -226,7 +225,7 @@ "+\tint timeout = 0;\n" "+\tint i;\n" "+\n" - "+\tprotocol = (read_write = I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ :\n" + "+\tprotocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ :\n" "+\t\tNVIDIA_SMB_PRTCL_WRITE;\n" "+\tpec = (flags & I2C_CLIENT_PEC) ? NVIDIA_SMB_PRTCL_PEC : 0;\n" "+\n" @@ -238,21 +237,21 @@ "+\t\t\tbreak;\n" "+\n" "+\t\tcase I2C_SMBUS_BYTE:\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\t\toutb_p(data->byte, NVIDIA_SMB_DATA);\n" "+\t\t\tprotocol |= NVIDIA_SMB_PRTCL_BYTE;\n" "+\t\t\tbreak;\n" "+\n" "+\t\tcase I2C_SMBUS_BYTE_DATA:\n" "+\t\t\toutb_p(command, NVIDIA_SMB_CMD);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\t\toutb_p(data->byte, NVIDIA_SMB_DATA);\n" "+\t\t\tprotocol |= NVIDIA_SMB_PRTCL_BYTE_DATA;\n" "+\t\t\tbreak;\n" "+\n" "+\t\tcase I2C_SMBUS_WORD_DATA:\n" "+\t\t\toutb_p(command, NVIDIA_SMB_CMD);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\t\t outb_p(data->word, NVIDIA_SMB_DATA);\n" "+\t\t\t\t outb_p(data->word >> 8, NVIDIA_SMB_DATA+1);\n" "+\t\t\t}\n" @@ -261,7 +260,7 @@ "+\n" "+\t\tcase I2C_SMBUS_BLOCK_DATA:\n" "+\t\t\toutb_p(command, NVIDIA_SMB_CMD);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\t\tlen = min_t(u8, data->block[0], 32);\n" "+\t\t\t\toutb_p(len, NVIDIA_SMB_BCNT);\n" "+\t\t\t\tfor (i = 0; i < len; i++)\n" @@ -274,7 +273,7 @@ "+\t\t\tlen = min_t(u8, data->block[0], 32);\n" "+\t\t\toutb_p(command, NVIDIA_SMB_CMD);\n" "+\t\t\toutb_p(len, NVIDIA_SMB_BCNT);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\t\tfor (i = 0; i < len; i++)\n" "+\t\t\t\t\toutb_p(data->block[i + 1], NVIDIA_SMB_DATA+i);\n" "+\t\t\tprotocol |= NVIDIA_SMB_PRTCL_I2C_BLOCK_DATA;\n" @@ -328,7 +327,7 @@ "+\tdo {\n" "+\t\tnforce2_do_pause(1);\n" "+\t\ttemp = inb_p(NVIDIA_SMB_STS);\n" - "+\t} while (((temp & NVIDIA_SMB_STS_DONE) = 0) && (timeout++ < MAX_TIMEOUT));\n" + "+\t} while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));\n" "+#endif\n" "+\tif (~temp & NVIDIA_SMB_STS_DONE) {\n" "+\t\tudelay(500);\n" @@ -344,7 +343,7 @@ "+\t\t|| (temp & NVIDIA_SMB_STS_STATUS))\n" "+\t\treturn -1;\n" "+\n" - "+\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\treturn 0;\n" "+\n" "+\tswitch (size) {\n" @@ -507,4 +506,4 @@ "+module_exit(nforce2_exit);\n" + -c5a86a76de55e04e25b7c68e1ced0685de575a3bb79f97d3a61533c1a454a5a0 +1c7a61fb44a379d65590771be87771d6a142ec30a89d194b30552a87d4911e95
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.