diff for duplicates of <10745567673681@kroah.com> diff --git a/a/1.txt b/N1/1.txt index e458448..eb29665 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -230,9 +230,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c adap->retries = arg; break; @@ -670,8 +665,8 @@ - if (((adap_id = address_data->force[i]) || - (address_data->force[i] = ANY_I2C_BUS)) && - (addr = address_data->force[i+1])) { + if (((adap_id == address_data->force[i]) || + (address_data->force[i] == ANY_I2C_BUS)) && + (addr == address_data->force[i+1])) { - DEB2(printk(KERN_DEBUG "i2c-core.o: found force parameter for adapter %d, addr %04x\n", - adap_id,addr)); + dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", @@ -241,9 +241,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c return err; found = 1; @@ -688,8 +683,8 @@ - if (((adap_id = address_data->ignore[i]) || - ((address_data->ignore[i] = ANY_I2C_BUS))) && - (addr = address_data->ignore[i+1])) { + if (((adap_id == address_data->ignore[i]) || + ((address_data->ignore[i] == ANY_I2C_BUS))) && + (addr == address_data->ignore[i+1])) { - DEB2(printk(KERN_DEBUG "i2c-core.o: found ignore parameter for adapter %d, " - "addr %04x\n", adap_id ,addr)); + dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, " @@ -252,7 +252,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c } } @@ -700,8 +695,8 @@ - ((address_data->ignore_range[i]=ANY_I2C_BUS))) && + ((address_data->ignore_range[i]==ANY_I2C_BUS))) && (addr >= address_data->ignore_range[i+1]) && (addr <= address_data->ignore_range[i+2])) { - DEB2(printk(KERN_DEBUG "i2c-core.o: found ignore_range parameter for adapter %d, " @@ -264,7 +264,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c } @@ -715,8 +710,8 @@ i += 1) { - if (addr = address_data->normal_i2c[i]) { + if (addr == address_data->normal_i2c[i]) { found = 1; - DEB2(printk(KERN_DEBUG "i2c-core.o: found normal i2c entry for adapter %d, " - "addr %02x", adap_id,addr)); @@ -285,8 +285,8 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c } @@ -738,8 +733,8 @@ - ((address_data->probe[i] = ANY_I2C_BUS))) && - (addr = address_data->probe[i+1])) { + ((address_data->probe[i] == ANY_I2C_BUS))) && + (addr == address_data->probe[i+1])) { found = 1; - DEB2(printk(KERN_DEBUG "i2c-core.o: found probe parameter for adapter %d, " - "addr %04x\n", adap_id,addr)); @@ -322,7 +322,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c @@ -1130,13 +1125,13 @@ case I2C_SMBUS_BLOCK_DATA: case I2C_SMBUS_BLOCK_DATA_PEC: - if (read_write = I2C_SMBUS_READ) { + if (read_write == I2C_SMBUS_READ) { - printk(KERN_ERR "i2c-core.o: Block read not supported " + dev_err(&adapter->dev, "Block read not supported " "under I2C emulation!\n"); @@ -386,7 +386,7 @@ diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c #include <linux/kernel.h> #include <linux/module.h> @@ -137,7 +139,7 @@ - if (tmp=NULL) + if (tmp==NULL) return -ENOMEM; - pr_debug("i2c-dev.o: i2c-%d reading %d bytes.\n", diff --git a/a/content_digest b/N1/content_digest index b4bc83b..e9e40ac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010745567661565@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:27 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -239,9 +238,9 @@ " \t\t\tadap->retries = arg;\n" " \t\t\tbreak;\n" "@@ -670,8 +665,8 @@\n" - " \t\t\tif (((adap_id = address_data->force[i]) || \n" - " \t\t\t (address_data->force[i] = ANY_I2C_BUS)) &&\n" - " \t\t\t (addr = address_data->force[i+1])) {\n" + " \t\t\tif (((adap_id == address_data->force[i]) || \n" + " \t\t\t (address_data->force[i] == ANY_I2C_BUS)) &&\n" + " \t\t\t (addr == address_data->force[i+1])) {\n" "-\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: found force parameter for adapter %d, addr %04x\\n\",\n" "-\t\t\t\t adap_id,addr));\n" "+\t\t\t\tdev_dbg(&adapter->dev, \"found force parameter for adapter %d, addr %04x\\n\",\n" @@ -250,9 +249,9 @@ " \t\t\t\t\treturn err;\n" " \t\t\t\tfound = 1;\n" "@@ -688,8 +683,8 @@\n" - " \t\t\tif (((adap_id = address_data->ignore[i]) || \n" - " \t\t\t ((address_data->ignore[i] = ANY_I2C_BUS))) &&\n" - " \t\t\t (addr = address_data->ignore[i+1])) {\n" + " \t\t\tif (((adap_id == address_data->ignore[i]) || \n" + " \t\t\t ((address_data->ignore[i] == ANY_I2C_BUS))) &&\n" + " \t\t\t (addr == address_data->ignore[i+1])) {\n" "-\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: found ignore parameter for adapter %d, \"\n" "-\t\t\t\t \"addr %04x\\n\", adap_id ,addr));\n" "+\t\t\t\tdev_dbg(&adapter->dev, \"found ignore parameter for adapter %d, \"\n" @@ -261,7 +260,7 @@ " \t\t\t}\n" " \t\t}\n" "@@ -700,8 +695,8 @@\n" - " \t\t\t ((address_data->ignore_range[i]=ANY_I2C_BUS))) &&\n" + " \t\t\t ((address_data->ignore_range[i]==ANY_I2C_BUS))) &&\n" " \t\t\t (addr >= address_data->ignore_range[i+1]) &&\n" " \t\t\t (addr <= address_data->ignore_range[i+2])) {\n" "-\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: found ignore_range parameter for adapter %d, \"\n" @@ -273,7 +272,7 @@ " \t\t}\n" "@@ -715,8 +710,8 @@\n" " \t\t i += 1) {\n" - " \t\t\tif (addr = address_data->normal_i2c[i]) {\n" + " \t\t\tif (addr == address_data->normal_i2c[i]) {\n" " \t\t\t\tfound = 1;\n" "-\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: found normal i2c entry for adapter %d, \"\n" "-\t\t\t\t \"addr %02x\", adap_id,addr));\n" @@ -294,8 +293,8 @@ " \t\t}\n" " \n" "@@ -738,8 +733,8 @@\n" - " \t\t\t ((address_data->probe[i] = ANY_I2C_BUS))) &&\n" - " \t\t\t (addr = address_data->probe[i+1])) {\n" + " \t\t\t ((address_data->probe[i] == ANY_I2C_BUS))) &&\n" + " \t\t\t (addr == address_data->probe[i+1])) {\n" " \t\t\t\tfound = 1;\n" "-\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: found probe parameter for adapter %d, \"\n" "-\t\t\t\t \"addr %04x\\n\", adap_id,addr));\n" @@ -331,7 +330,7 @@ "@@ -1130,13 +1125,13 @@\n" " \tcase I2C_SMBUS_BLOCK_DATA:\n" " \tcase I2C_SMBUS_BLOCK_DATA_PEC:\n" - " \t\tif (read_write = I2C_SMBUS_READ) {\n" + " \t\tif (read_write == I2C_SMBUS_READ) {\n" "-\t\t\tprintk(KERN_ERR \"i2c-core.o: Block read not supported \"\n" "+\t\t\tdev_err(&adapter->dev, \"Block read not supported \"\n" " \t\t\t \"under I2C emulation!\\n\");\n" @@ -395,7 +394,7 @@ " #include <linux/kernel.h>\n" " #include <linux/module.h>\n" "@@ -137,7 +139,7 @@\n" - " \tif (tmp=NULL)\n" + " \tif (tmp==NULL)\n" " \t\treturn -ENOMEM;\n" " \n" "-\tpr_debug(\"i2c-dev.o: i2c-%d reading %d bytes.\\n\",\n" @@ -428,4 +427,4 @@ " #include <linux/module.h>\n" #include <linux/kernel.h> -96e3227c453abd97f9fb0c050a21246b25b2069741e7f9f7a8689b2e68ce186e +cce4b90596e324b9123ddb8cb89301c1fe044ed6f169f3be1911a6055f019c02
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.