diff for duplicates of <1105162776515@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 6652bef..88ee308 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -104,7 +104,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c + int i; + + for (i = 0; i < adap->xfer_timeout; i++) { -+ if ((get_control() & SGI_I2C_XFER_BUSY) = 0) ++ if ((get_control() & SGI_I2C_XFER_BUSY) == 0) + return 0; + udelay(1); + } @@ -119,7 +119,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c + if (wait_xfer_done(adap)) + return -ETIMEDOUT; + for (i = 0; i < adap->ack_timeout; i++) { -+ if ((get_control() & SGI_I2C_NACK) = 0) ++ if ((get_control() & SGI_I2C_NACK) == 0) + return 0; + udelay(1); + } @@ -133,7 +133,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c + + set_control(SGI_I2C_FORCE_IDLE); + for (i = 0; i < adap->xfer_timeout; i++) { -+ if ((get_control() & SGI_I2C_NOT_IDLE) = 0) ++ if ((get_control() & SGI_I2C_NOT_IDLE) == 0) + goto out; + udelay(1); + } @@ -275,7 +275,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sib + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* ------------------------------------------------------------------------- */ + -+/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even ++/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even + Frodo Looijaard <frodol@dds.nl>. */ + +/* Ported for SiByte SOCs by Broadcom Corporation. */ @@ -315,11 +315,11 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sib + + switch (size) { + case I2C_SMBUS_QUICK: -+ csr_out32((V_SMB_ADDR(addr) | (read_write = I2C_SMBUS_READ ? M_SMB_QDATA : 0) | ++ csr_out32((V_SMB_ADDR(addr) | (read_write == I2C_SMBUS_READ ? M_SMB_QDATA : 0) | + V_SMB_TT_QUICKCMD), SMB_CSR(adap, R_SMB_START)); + break; + case I2C_SMBUS_BYTE: -+ if (read_write = I2C_SMBUS_READ) { ++ if (read_write == I2C_SMBUS_READ) { + csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_RD1BYTE), + SMB_CSR(adap, R_SMB_START)); + data_bytes = 1; @@ -331,7 +331,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sib + break; + case I2C_SMBUS_BYTE_DATA: + csr_out32(V_SMB_CMD(command), SMB_CSR(adap, R_SMB_CMD)); -+ if (read_write = I2C_SMBUS_READ) { ++ if (read_write == I2C_SMBUS_READ) { + csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_CMD_RD1BYTE), + SMB_CSR(adap, R_SMB_START)); + data_bytes = 1; @@ -343,7 +343,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sib + break; + case I2C_SMBUS_WORD_DATA: + csr_out32(V_SMB_CMD(command), SMB_CSR(adap, R_SMB_CMD)); -+ if (read_write = I2C_SMBUS_READ) { ++ if (read_write == I2C_SMBUS_READ) { + csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_CMD_RD2BYTE), + SMB_CSR(adap, R_SMB_START)); + data_bytes = 2; @@ -368,9 +368,9 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sib + return -1; /* XXXKW better error code? */ + } + -+ if (data_bytes = 1) ++ if (data_bytes == 1) + data->byte = csr_in32(SMB_CSR(adap, R_SMB_DATA)) & 0xff; -+ if (data_bytes = 2) ++ if (data_bytes == 2) + data->word = csr_in32(SMB_CSR(adap, R_SMB_DATA)) & 0xffff; + + return 0; diff --git a/a/content_digest b/N1/content_digest index 5483c40..30ed255 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011051627764199@kroah.com\0" - "ref\011051627731563@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C patches for 2.6.10\0" - "Date\0Thu, 19 May 2005 06:25:30 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C patches for 2.6.10\0" + "Date\0Fri, 7 Jan 2005 21:39:36 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -113,7 +112,7 @@ "+\tint i;\n" "+\n" "+\tfor (i = 0; i < adap->xfer_timeout; i++) {\n" - "+\t\tif ((get_control() & SGI_I2C_XFER_BUSY) = 0)\n" + "+\t\tif ((get_control() & SGI_I2C_XFER_BUSY) == 0)\n" "+\t\t\treturn 0;\n" "+\t\tudelay(1);\n" "+\t}\n" @@ -128,7 +127,7 @@ "+\tif (wait_xfer_done(adap))\n" "+\t\treturn -ETIMEDOUT;\n" "+\tfor (i = 0; i < adap->ack_timeout; i++) {\n" - "+\t\tif ((get_control() & SGI_I2C_NACK) = 0)\n" + "+\t\tif ((get_control() & SGI_I2C_NACK) == 0)\n" "+\t\t\treturn 0;\n" "+\t\tudelay(1);\n" "+\t}\n" @@ -142,7 +141,7 @@ "+\n" "+\tset_control(SGI_I2C_FORCE_IDLE);\n" "+\tfor (i = 0; i < adap->xfer_timeout; i++) {\n" - "+\t\tif ((get_control() & SGI_I2C_NOT_IDLE) = 0)\n" + "+\t\tif ((get_control() & SGI_I2C_NOT_IDLE) == 0)\n" "+\t\t\tgoto out;\n" "+\t\tudelay(1);\n" "+\t}\n" @@ -284,7 +283,7 @@ "+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\t\t */\n" "+/* ------------------------------------------------------------------------- */\n" "+\n" - "+/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even\n" + "+/* With some changes from Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi> and even\n" "+ Frodo Looijaard <frodol@dds.nl>. */\n" "+\n" "+/* Ported for SiByte SOCs by Broadcom Corporation. */\n" @@ -324,11 +323,11 @@ "+\n" "+ switch (size) {\n" "+ case I2C_SMBUS_QUICK:\n" - "+ csr_out32((V_SMB_ADDR(addr) | (read_write = I2C_SMBUS_READ ? M_SMB_QDATA : 0) |\n" + "+ csr_out32((V_SMB_ADDR(addr) | (read_write == I2C_SMBUS_READ ? M_SMB_QDATA : 0) |\n" "+\t\t\t V_SMB_TT_QUICKCMD), SMB_CSR(adap, R_SMB_START));\n" "+ break;\n" "+ case I2C_SMBUS_BYTE:\n" - "+ if (read_write = I2C_SMBUS_READ) {\n" + "+ if (read_write == I2C_SMBUS_READ) {\n" "+ csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_RD1BYTE),\n" "+\t\t\t\t SMB_CSR(adap, R_SMB_START));\n" "+ data_bytes = 1;\n" @@ -340,7 +339,7 @@ "+ break;\n" "+ case I2C_SMBUS_BYTE_DATA:\n" "+ csr_out32(V_SMB_CMD(command), SMB_CSR(adap, R_SMB_CMD));\n" - "+ if (read_write = I2C_SMBUS_READ) {\n" + "+ if (read_write == I2C_SMBUS_READ) {\n" "+ csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_CMD_RD1BYTE),\n" "+\t\t\t\t SMB_CSR(adap, R_SMB_START));\n" "+ data_bytes = 1;\n" @@ -352,7 +351,7 @@ "+ break;\n" "+ case I2C_SMBUS_WORD_DATA:\n" "+ csr_out32(V_SMB_CMD(command), SMB_CSR(adap, R_SMB_CMD));\n" - "+ if (read_write = I2C_SMBUS_READ) {\n" + "+ if (read_write == I2C_SMBUS_READ) {\n" "+ csr_out32((V_SMB_ADDR(addr) | V_SMB_TT_CMD_RD2BYTE),\n" "+\t\t\t\t SMB_CSR(adap, R_SMB_START));\n" "+ data_bytes = 2;\n" @@ -377,9 +376,9 @@ "+ return -1; /* XXXKW better error code? */\n" "+ }\n" "+\n" - "+ if (data_bytes = 1)\n" + "+ if (data_bytes == 1)\n" "+ data->byte = csr_in32(SMB_CSR(adap, R_SMB_DATA)) & 0xff;\n" - "+ if (data_bytes = 2)\n" + "+ if (data_bytes == 2)\n" "+ data->word = csr_in32(SMB_CSR(adap, R_SMB_DATA)) & 0xffff;\n" "+\n" "+ return 0;\n" @@ -700,4 +699,4 @@ " /* --- XSCALE on-chip adapters */\n" #define I2C_HW_IOP321 0x00 -891c4488a4646f8d3b4e7f1dedfd3054386cb0d2430c66484d2ad0b6972fe808 +389737e304867d58d3d443ad86eff60d15cb09fc5fec520c4ab55511d5440eb4
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.