diff for duplicates of <10642734272108@kroah.com> diff --git a/a/1.txt b/N1/1.txt index a61986b..04a803c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -302,7 +302,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + + case state_quick: + if (iface->address_byte & 1) { -+ if (iface->len = 1) ++ if (iface->len == 1) + outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1); + else + outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1); @@ -318,7 +318,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + + case state_read: + /* Set ACK if receiving the last byte */ -+ if (iface->len = 1) ++ if (iface->len == 1) + outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1); + else + outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1); @@ -326,7 +326,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + *iface->ptr++ = inb(ACBSDA); + --iface->len; + -+ if (iface->len = 0) { ++ if (iface->len == 0) { + iface->result = 0; + iface->state = state_idle; + outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1); @@ -335,7 +335,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + break; + + case state_write: -+ if (iface->len = 0) { ++ if (iface->len == 0) { + iface->result = 0; + iface->state = state_idle; + outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1); @@ -438,7 +438,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + buffer = NULL; + break; + case I2C_SMBUS_BYTE: -+ if (rw = I2C_SMBUS_READ) { ++ if (rw == I2C_SMBUS_READ) { + len = 1; + buffer = &data->byte; + } else { @@ -464,9 +464,9 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + } + + DBG("size=%d, address=0x%x, command=0x%x, len=%d, read=%d\n", -+ size, address, command, len, rw = I2C_SMBUS_READ); ++ size, address, command, len, rw == I2C_SMBUS_READ); + -+ if (!len && rw = I2C_SMBUS_READ) { ++ if (!len && rw == I2C_SMBUS_READ) { + dev_warn(&adapter->dev, "zero length read\n"); + return -EINVAL; + } @@ -479,7 +479,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + down(&iface->sem); + + iface->address_byte = address<<1; -+ if (rw = I2C_SMBUS_READ) ++ if (rw == I2C_SMBUS_READ) + iface->address_byte |= 1; + iface->command = command; + iface->ptr = buffer; @@ -489,7 +489,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + + outb(inb(ACBCTL1) | ACBCTL1_START, ACBCTL1); + -+ if (size = I2C_SMBUS_QUICK || size = I2C_SMBUS_BYTE) ++ if (size == I2C_SMBUS_QUICK || size == I2C_SMBUS_BYTE) + iface->state = state_quick; + else + iface->state = state_address; @@ -508,7 +508,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + + up(&iface->sem); + -+ if (rc = 0 && size = I2C_SMBUS_WORD_DATA && rw = I2C_SMBUS_READ) ++ if (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ) + data->word = le16_to_cpu(cur_word); + +#if DEBUG @@ -601,7 +601,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + init_MUTEX(&iface->sem); + + snprintf(description, sizeof(description), "NatSemi SCx200 ACCESS.bus [%s]", adapter->name); -+ if (request_region(base, 8, description) = 0) { ++ if (request_region(base, 8, description) == 0) { + dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n", + base, base + 8-1); + rc = -EBUSY; @@ -649,7 +649,7 @@ diff -Nru a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c + /* Verify that this really is a SCx200 processor */ + if (pci_find_device(PCI_VENDOR_ID_NS, + PCI_DEVICE_ID_NS_SCx200_BRIDGE, -+ NULL) = NULL) ++ NULL) == NULL) + return -ENODEV; + + rc = -ENXIO; @@ -792,7 +792,7 @@ diff -Nru a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c + printk(KERN_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"); + return -EINVAL; + } @@ -995,7 +995,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - - case state_quick: - if (iface->address_byte & 1) { -- if (iface->len = 1) +- if (iface->len == 1) - outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1); - else - outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1); @@ -1011,7 +1011,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - - case state_read: - /* Set ACK if receiving the last byte */ -- if (iface->len = 1) +- if (iface->len == 1) - outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1); - else - outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1); @@ -1019,7 +1019,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - *iface->ptr++ = inb(ACBSDA); - --iface->len; - -- if (iface->len = 0) { +- if (iface->len == 0) { - iface->result = 0; - iface->state = state_idle; - outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1); @@ -1028,7 +1028,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - break; - - case state_write: -- if (iface->len = 0) { +- if (iface->len == 0) { - iface->result = 0; - iface->state = state_idle; - outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1); @@ -1131,7 +1131,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - buffer = NULL; - break; - case I2C_SMBUS_BYTE: -- if (rw = I2C_SMBUS_READ) { +- if (rw == I2C_SMBUS_READ) { - len = 1; - buffer = &data->byte; - } else { @@ -1157,9 +1157,9 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - } - - DBG("size=%d, address=0x%x, command=0x%x, len=%d, read=%d\n", -- size, address, command, len, rw = I2C_SMBUS_READ); +- size, address, command, len, rw == I2C_SMBUS_READ); - -- if (!len && rw = I2C_SMBUS_READ) { +- if (!len && rw == I2C_SMBUS_READ) { - dev_warn(&adapter->dev, "zero length read\n"); - return -EINVAL; - } @@ -1172,7 +1172,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - down(&iface->sem); - - iface->address_byte = address<<1; -- if (rw = I2C_SMBUS_READ) +- if (rw == I2C_SMBUS_READ) - iface->address_byte |= 1; - iface->command = command; - iface->ptr = buffer; @@ -1182,7 +1182,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - - outb(inb(ACBCTL1) | ACBCTL1_START, ACBCTL1); - -- if (size = I2C_SMBUS_QUICK || size = I2C_SMBUS_BYTE) +- if (size == I2C_SMBUS_QUICK || size == I2C_SMBUS_BYTE) - iface->state = state_quick; - else - iface->state = state_address; @@ -1201,7 +1201,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - - up(&iface->sem); - -- if (rc = 0 && size = I2C_SMBUS_WORD_DATA && rw = I2C_SMBUS_READ) +- if (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ) - data->word = le16_to_cpu(cur_word); - -#if DEBUG @@ -1294,7 +1294,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - init_MUTEX(&iface->sem); - - snprintf(description, sizeof(description), "NatSemi SCx200 ACCESS.bus [%s]", adapter->name); -- if (request_region(base, 8, description) = 0) { +- if (request_region(base, 8, description) == 0) { - dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n", - base, base + 8-1); - rc = -EBUSY; @@ -1342,7 +1342,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - /* Verify that this really is a SCx200 processor */ - if (pci_find_device(PCI_VENDOR_ID_NS, - PCI_DEVICE_ID_NS_SCx200_BRIDGE, -- NULL) = NULL) +- NULL) == NULL) - return -ENODEV; - - rc = -ENXIO; @@ -1486,7 +1486,7 @@ diff -Nru a/drivers/i2c/scx200_i2c.c b/drivers/i2c/scx200_i2c.c - printk(KERN_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"); - return -EINVAL; - } diff --git a/a/content_digest b/N1/content_digest index 6d04ba6..99a463e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734271040@kroah.com\0" - "ref\01064273416272@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0-test5\0" - "Date\0Thu, 19 May 2005 06:24:18 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0-test5\0" + "Date\0Mon, 22 Sep 2003 16:30:27 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -311,7 +310,7 @@ "+\t\t\n" "+\tcase state_quick:\n" "+\t\tif (iface->address_byte & 1) {\n" - "+\t\t\tif (iface->len = 1) \n" + "+\t\t\tif (iface->len == 1) \n" "+\t\t\t\toutb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);\n" "+\t\t\telse\n" "+\t\t\t\toutb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);\n" @@ -327,7 +326,7 @@ "+\n" "+\tcase state_read:\n" "+\t\t/* Set ACK if receiving the last byte */\n" - "+\t\tif (iface->len = 1)\n" + "+\t\tif (iface->len == 1)\n" "+\t\t\toutb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);\n" "+\t\telse\n" "+\t\t\toutb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);\n" @@ -335,7 +334,7 @@ "+\t\t*iface->ptr++ = inb(ACBSDA);\n" "+\t\t--iface->len;\n" "+\n" - "+\t\tif (iface->len = 0) {\n" + "+\t\tif (iface->len == 0) {\n" "+\t\t\tiface->result = 0;\n" "+\t\t\tiface->state = state_idle;\n" "+\t\t\toutb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);\n" @@ -344,7 +343,7 @@ "+\t\tbreak;\n" "+\n" "+\tcase state_write:\n" - "+\t\tif (iface->len = 0) {\n" + "+\t\tif (iface->len == 0) {\n" "+\t\t\tiface->result = 0;\n" "+\t\t\tiface->state = state_idle;\n" "+\t\t\toutb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);\n" @@ -447,7 +446,7 @@ "+\t \tbuffer = NULL;\n" "+\t \tbreak;\n" "+\tcase I2C_SMBUS_BYTE:\n" - "+\t\tif (rw = I2C_SMBUS_READ) {\n" + "+\t\tif (rw == I2C_SMBUS_READ) {\n" "+\t\t\tlen = 1;\n" "+\t\t\tbuffer = &data->byte;\n" "+\t\t} else {\n" @@ -473,9 +472,9 @@ "+\t}\n" "+\n" "+\tDBG(\"size=%d, address=0x%x, command=0x%x, len=%d, read=%d\\n\",\n" - "+\t size, address, command, len, rw = I2C_SMBUS_READ);\n" + "+\t size, address, command, len, rw == I2C_SMBUS_READ);\n" "+\n" - "+\tif (!len && rw = I2C_SMBUS_READ) {\n" + "+\tif (!len && rw == I2C_SMBUS_READ) {\n" "+\t\tdev_warn(&adapter->dev, \"zero length read\\n\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -488,7 +487,7 @@ "+\tdown(&iface->sem);\n" "+\n" "+\tiface->address_byte = address<<1;\n" - "+\tif (rw = I2C_SMBUS_READ)\n" + "+\tif (rw == I2C_SMBUS_READ)\n" "+\t\tiface->address_byte |= 1;\n" "+\tiface->command = command;\n" "+\tiface->ptr = buffer;\n" @@ -498,7 +497,7 @@ "+\n" "+\toutb(inb(ACBCTL1) | ACBCTL1_START, ACBCTL1);\n" "+\n" - "+\tif (size = I2C_SMBUS_QUICK || size = I2C_SMBUS_BYTE)\n" + "+\tif (size == I2C_SMBUS_QUICK || size == I2C_SMBUS_BYTE)\n" "+\t\tiface->state = state_quick;\n" "+\telse\n" "+\t\tiface->state = state_address;\n" @@ -517,7 +516,7 @@ "+\n" "+\tup(&iface->sem);\n" "+\n" - "+\tif (rc = 0 && size = I2C_SMBUS_WORD_DATA && rw = I2C_SMBUS_READ)\n" + "+\tif (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ)\n" "+\t \tdata->word = le16_to_cpu(cur_word);\n" "+\n" "+#if DEBUG\n" @@ -610,7 +609,7 @@ "+\tinit_MUTEX(&iface->sem);\n" "+\n" "+\tsnprintf(description, sizeof(description), \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->name);\n" - "+\tif (request_region(base, 8, description) = 0) {\n" + "+\tif (request_region(base, 8, description) == 0) {\n" "+\t\tdev_err(&adapter->dev, \"can't allocate io 0x%x-0x%x\\n\",\n" "+\t\t\tbase, base + 8-1);\n" "+\t\trc = -EBUSY;\n" @@ -658,7 +657,7 @@ "+\t/* Verify that this really is a SCx200 processor */\n" "+\tif (pci_find_device(PCI_VENDOR_ID_NS,\n" "+\t\t\t PCI_DEVICE_ID_NS_SCx200_BRIDGE,\n" - "+\t\t\t NULL) = NULL)\n" + "+\t\t\t NULL) == NULL)\n" "+\t\treturn -ENODEV;\n" "+\n" "+\trc = -ENXIO;\n" @@ -801,7 +800,7 @@ "+\tprintk(KERN_DEBUG NAME \": SCL=GPIO%02u, SDA=GPIO%02u\\n\", \n" "+\t 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\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -1004,7 +1003,7 @@ "-\t\t\n" "-\tcase state_quick:\n" "-\t\tif (iface->address_byte & 1) {\n" - "-\t\t\tif (iface->len = 1) \n" + "-\t\t\tif (iface->len == 1) \n" "-\t\t\t\toutb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);\n" "-\t\t\telse\n" "-\t\t\t\toutb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);\n" @@ -1020,7 +1019,7 @@ "-\n" "-\tcase state_read:\n" "-\t\t/* Set ACK if receiving the last byte */\n" - "-\t\tif (iface->len = 1)\n" + "-\t\tif (iface->len == 1)\n" "-\t\t\toutb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);\n" "-\t\telse\n" "-\t\t\toutb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);\n" @@ -1028,7 +1027,7 @@ "-\t\t*iface->ptr++ = inb(ACBSDA);\n" "-\t\t--iface->len;\n" "-\n" - "-\t\tif (iface->len = 0) {\n" + "-\t\tif (iface->len == 0) {\n" "-\t\t\tiface->result = 0;\n" "-\t\t\tiface->state = state_idle;\n" "-\t\t\toutb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);\n" @@ -1037,7 +1036,7 @@ "-\t\tbreak;\n" "-\n" "-\tcase state_write:\n" - "-\t\tif (iface->len = 0) {\n" + "-\t\tif (iface->len == 0) {\n" "-\t\t\tiface->result = 0;\n" "-\t\t\tiface->state = state_idle;\n" "-\t\t\toutb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);\n" @@ -1140,7 +1139,7 @@ "-\t \tbuffer = NULL;\n" "-\t \tbreak;\n" "-\tcase I2C_SMBUS_BYTE:\n" - "-\t\tif (rw = I2C_SMBUS_READ) {\n" + "-\t\tif (rw == I2C_SMBUS_READ) {\n" "-\t\t\tlen = 1;\n" "-\t\t\tbuffer = &data->byte;\n" "-\t\t} else {\n" @@ -1166,9 +1165,9 @@ "-\t}\n" "-\n" "-\tDBG(\"size=%d, address=0x%x, command=0x%x, len=%d, read=%d\\n\",\n" - "-\t size, address, command, len, rw = I2C_SMBUS_READ);\n" + "-\t size, address, command, len, rw == I2C_SMBUS_READ);\n" "-\n" - "-\tif (!len && rw = I2C_SMBUS_READ) {\n" + "-\tif (!len && rw == I2C_SMBUS_READ) {\n" "-\t\tdev_warn(&adapter->dev, \"zero length read\\n\");\n" "-\t\treturn -EINVAL;\n" "-\t}\n" @@ -1181,7 +1180,7 @@ "-\tdown(&iface->sem);\n" "-\n" "-\tiface->address_byte = address<<1;\n" - "-\tif (rw = I2C_SMBUS_READ)\n" + "-\tif (rw == I2C_SMBUS_READ)\n" "-\t\tiface->address_byte |= 1;\n" "-\tiface->command = command;\n" "-\tiface->ptr = buffer;\n" @@ -1191,7 +1190,7 @@ "-\n" "-\toutb(inb(ACBCTL1) | ACBCTL1_START, ACBCTL1);\n" "-\n" - "-\tif (size = I2C_SMBUS_QUICK || size = I2C_SMBUS_BYTE)\n" + "-\tif (size == I2C_SMBUS_QUICK || size == I2C_SMBUS_BYTE)\n" "-\t\tiface->state = state_quick;\n" "-\telse\n" "-\t\tiface->state = state_address;\n" @@ -1210,7 +1209,7 @@ "-\n" "-\tup(&iface->sem);\n" "-\n" - "-\tif (rc = 0 && size = I2C_SMBUS_WORD_DATA && rw = I2C_SMBUS_READ)\n" + "-\tif (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ)\n" "-\t \tdata->word = le16_to_cpu(cur_word);\n" "-\n" "-#if DEBUG\n" @@ -1303,7 +1302,7 @@ "-\tinit_MUTEX(&iface->sem);\n" "-\n" "-\tsnprintf(description, sizeof(description), \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->name);\n" - "-\tif (request_region(base, 8, description) = 0) {\n" + "-\tif (request_region(base, 8, description) == 0) {\n" "-\t\tdev_err(&adapter->dev, \"can't allocate io 0x%x-0x%x\\n\",\n" "-\t\t\tbase, base + 8-1);\n" "-\t\trc = -EBUSY;\n" @@ -1351,7 +1350,7 @@ "-\t/* Verify that this really is a SCx200 processor */\n" "-\tif (pci_find_device(PCI_VENDOR_ID_NS,\n" "-\t\t\t PCI_DEVICE_ID_NS_SCx200_BRIDGE,\n" - "-\t\t\t NULL) = NULL)\n" + "-\t\t\t NULL) == NULL)\n" "-\t\treturn -ENODEV;\n" "-\n" "-\trc = -ENXIO;\n" @@ -1495,7 +1494,7 @@ "-\tprintk(KERN_DEBUG NAME \": SCL=GPIO%02u, SDA=GPIO%02u\\n\", \n" "-\t 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\");\n" "-\t\treturn -EINVAL;\n" "-\t}\n" @@ -1528,4 +1527,4 @@ "- End:\n" -*/ -76e91e9ba66da8d419b9c11cef7f20e23eae77a5ed750ea82080de9f12e29d3a +b0258c6a05dae1b8539553fecf072afe629b14a69935b9470a253afe4d6dbf2b
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.