diff for duplicates of <10745567681965@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 49ea942..0b5f5c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -194,7 +194,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c --- a/drivers/i2c/busses/i2c-elv.c Mon Jan 19 15:27:44 2004 +++ b/drivers/i2c/busses/i2c-elv.c Mon Jan 19 15:27:44 2004 @@ -21,6 +21,11 @@ - /* 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> */ +#include <linux/config.h> @@ -348,7 +348,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c --- a/drivers/i2c/busses/i2c-ite.c Mon Jan 19 15:27:44 2004 +++ b/drivers/i2c/busses/i2c-ite.c Mon Jan 19 15:27:44 2004 @@ -33,6 +33,11 @@ - /* 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> */ +#include <linux/config.h> @@ -460,7 +460,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c - DBG("handle_interrupt(), got: %x, status: %x, state: %d\n", + pr_debug("handle_interrupt(), got: %x, status: %x, state: %d\n", isr, read_reg(reg_status), iface->state); - if (isr = 0 && iface->state != state_stop) { + if (isr == 0 && iface->state != state_stop) { do_stop(iface, -1); @@ -112,7 +110,7 @@ break; @@ -468,7 +468,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c ack = read_reg(reg_status); - DBG("ack on set address: %x\n", ack); + pr_debug("ack on set address: %x\n", ack); - if ((ack & KW_I2C_STAT_LAST_AAK) = 0) { + if ((ack & KW_I2C_STAT_LAST_AAK) == 0) { do_stop(iface, -1); break; @@ -127,7 +125,7 @@ @@ -487,7 +487,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c - DBG("read byte: %x\n", *(iface->data-1)); + pr_debug("read byte: %x\n", *(iface->data-1)); iface->datalen--; - if (iface->datalen = 0) + if (iface->datalen == 0) iface->state = state_stop; @@ -153,13 +151,13 @@ } @@ -495,7 +495,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c ack = read_reg(reg_status); - DBG("ack on data write: %x\n", ack); + pr_debug("ack on data write: %x\n", ack); - if ((ack & KW_I2C_STAT_LAST_AAK) = 0) { + if ((ack & KW_I2C_STAT_LAST_AAK) == 0) { do_stop(iface, -1); break; } @@ -520,7 +520,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c - DBG("chan: %d, addr: 0x%x, transfer len: %d, read: %d\n", + pr_debug("chan: %d, addr: 0x%x, transfer len: %d, read: %d\n", - chan->chan_no, addr, len, read_write = I2C_SMBUS_READ); + chan->chan_no, addr, len, read_write == I2C_SMBUS_READ); iface->data = buffer; @@ -306,7 +304,7 @@ @@ -530,7 +530,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c - DBG("transfer done, result: %d\n", rc); + pr_debug("transfer done, result: %d\n", rc); - if (rc = 0 && size = I2C_SMBUS_WORD_DATA && read_write = I2C_SMBUS_READ) + if (rc == 0 && size == I2C_SMBUS_WORD_DATA && read_write == I2C_SMBUS_READ) data->word = le16_to_cpu(cur_word); @@ -348,7 +346,7 @@ rc = -EINVAL; @@ -543,7 +543,7 @@ diff -Nru a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c pmsg->len, addr, i, num); @@ -388,7 +386,7 @@ rc = iface->result; - if (rc = 0) + if (rc == 0) completed++; - DBG("transfer done, result: %d\n", rc); + pr_debug("transfer done, result: %d\n", rc); @@ -903,5 +903,5 @@ diff -Nru a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c - scl, sda); + pr_debug(NAME ": SCL=GPIO%02u, SDA=GPIO%02u\n", scl, sda); - if (scl = -1 || sda = -1 || scl = sda) { + if (scl == -1 || sda == -1 || scl == sda) { printk(KERN_ERR NAME ": scl and sda must be specified\n"); diff --git a/a/content_digest b/N1/content_digest index 384fac1..3a7e0b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01074556767824@kroah.com\0" - "ref\01074556757661@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.1\0" - "Date\0Thu, 19 May 2005 06:24:36 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.1\0" + "Date\0Mon, 19 Jan 2004 15:59:28 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -203,7 +202,7 @@ "--- a/drivers/i2c/busses/i2c-elv.c\tMon Jan 19 15:27:44 2004\n" "+++ b/drivers/i2c/busses/i2c-elv.c\tMon Jan 19 15:27:44 2004\n" "@@ -21,6 +21,11 @@\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" "+#include <linux/config.h>\n" @@ -357,7 +356,7 @@ "--- a/drivers/i2c/busses/i2c-ite.c\tMon Jan 19 15:27:44 2004\n" "+++ b/drivers/i2c/busses/i2c-ite.c\tMon Jan 19 15:27:44 2004\n" "@@ -33,6 +33,11 @@\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" "+#include <linux/config.h>\n" @@ -469,7 +468,7 @@ "-\tDBG(\"handle_interrupt(), got: %x, status: %x, state: %d\\n\",\n" "+\tpr_debug(\"handle_interrupt(), got: %x, status: %x, state: %d\\n\",\n" " \t\tisr, read_reg(reg_status), iface->state);\n" - " \tif (isr = 0 && iface->state != state_stop) {\n" + " \tif (isr == 0 && iface->state != state_stop) {\n" " \t\tdo_stop(iface, -1);\n" "@@ -112,7 +110,7 @@\n" " \t\t\tbreak;\n" @@ -477,7 +476,7 @@ " \t\tack = read_reg(reg_status);\n" "-\t\tDBG(\"ack on set address: %x\\n\", ack);\n" "+\t\tpr_debug(\"ack on set address: %x\\n\", ack);\n" - " \t\tif ((ack & KW_I2C_STAT_LAST_AAK) = 0) {\n" + " \t\tif ((ack & KW_I2C_STAT_LAST_AAK) == 0) {\n" " \t\t\tdo_stop(iface, -1);\n" " \t\t\tbreak;\n" "@@ -127,7 +125,7 @@\n" @@ -496,7 +495,7 @@ "-\t\tDBG(\"read byte: %x\\n\", *(iface->data-1));\n" "+\t\tpr_debug(\"read byte: %x\\n\", *(iface->data-1));\n" " \t\tiface->datalen--;\n" - " \t\tif (iface->datalen = 0)\n" + " \t\tif (iface->datalen == 0)\n" " \t\t\tiface->state = state_stop;\n" "@@ -153,13 +151,13 @@\n" " \t\t}\n" @@ -504,7 +503,7 @@ " \t\tack = read_reg(reg_status);\n" "-\t\tDBG(\"ack on data write: %x\\n\", ack);\n" "+\t\tpr_debug(\"ack on data write: %x\\n\", ack);\n" - " \t\tif ((ack & KW_I2C_STAT_LAST_AAK) = 0) {\n" + " \t\tif ((ack & KW_I2C_STAT_LAST_AAK) == 0) {\n" " \t\t\tdo_stop(iface, -1);\n" " \t\t\tbreak;\n" " \t\t}\n" @@ -529,7 +528,7 @@ " \n" "-\tDBG(\"chan: %d, addr: 0x%x, transfer len: %d, read: %d\\n\",\n" "+\tpr_debug(\"chan: %d, addr: 0x%x, transfer len: %d, read: %d\\n\",\n" - " \t\tchan->chan_no, addr, len, read_write = I2C_SMBUS_READ);\n" + " \t\tchan->chan_no, addr, len, read_write == I2C_SMBUS_READ);\n" " \n" " \tiface->data = buffer;\n" "@@ -306,7 +304,7 @@\n" @@ -539,7 +538,7 @@ "-\tDBG(\"transfer done, result: %d\\n\", rc);\n" "+\tpr_debug(\"transfer done, result: %d\\n\", rc);\n" " \n" - " \tif (rc = 0 && size = I2C_SMBUS_WORD_DATA && read_write = I2C_SMBUS_READ)\n" + " \tif (rc == 0 && size == I2C_SMBUS_WORD_DATA && read_write == I2C_SMBUS_READ)\n" " \t \tdata->word = le16_to_cpu(cur_word);\n" "@@ -348,7 +346,7 @@\n" " \t\t\trc = -EINVAL;\n" @@ -552,7 +551,7 @@ " pmsg->len, addr, i, num);\n" "@@ -388,7 +386,7 @@\n" " \t\trc = iface->result;\n" - " \t\tif (rc = 0)\n" + " \t\tif (rc == 0)\n" " \t\t\tcompleted++;\n" "-\t\tDBG(\"transfer done, result: %d\\n\", rc);\n" "+\t\tpr_debug(\"transfer done, result: %d\\n\", rc);\n" @@ -912,7 +911,7 @@ "-\t scl, sda);\n" "+\tpr_debug(NAME \": SCL=GPIO%02u, SDA=GPIO%02u\\n\", scl, sda);\n" " \n" - " \tif (scl = -1 || sda = -1 || scl = sda) {\n" + " \tif (scl == -1 || sda == -1 || scl == sda) {\n" " \t\tprintk(KERN_ERR NAME \": scl and sda must be specified\\n\");" -017c5eab5046301ba0b58e4f41e9d2562888b5734d0f0ed3f393d4428bc0cfd5 +dc6ed1109de70389f444020d77b150d2fd1b9829477dda3cbd9ebe92b4150615
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.