diff for duplicates of <1048295084971@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 48192a3..81946d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -178,7 +178,7 @@ diff -Nru a/drivers/i2c/i2c-algo-bit.c b/drivers/i2c/i2c-algo-bit.c - i2c_adap->name, c&0xff)); + DEB2(dev_dbg(&i2c_adap->dev, "sendbytes: writing %2.2X\n", c&0xff)); retval = i2c_outb(i2c_adap,c); - if ((retval>0) || (nak_ok && (retval=0))) { /* ok or ignored NAK */ + if ((retval>0) || (nak_ok && (retval==0))) { /* ok or ignored NAK */ count--; temp++; wrcount++; @@ -283,9 +283,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c #include <linux/kernel.h> #include <linux/errno.h> @@ -82,9 +84,8 @@ - if (NULL = adapters[i]) + if (NULL == adapters[i]) break; - if (I2C_ADAP_MAX = i) { + if (I2C_ADAP_MAX == i) { - printk(KERN_WARNING - " i2c-core.o: register_adapter(%s) - enlarge I2C_ADAP_MAX.\n", - adap->name); @@ -295,7 +295,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c goto out_unlock; } @@ -105,7 +106,6 @@ - if (adap->dev.parent = NULL) + if (adap->dev.parent == NULL) adap->dev.parent = &legacy_bus; sprintf(adap->dev.bus_id, "i2c-%d", i); - strcpy(adap->dev.name, "i2c controller"); @@ -313,9 +313,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c out_unlock: up(&core_lists); @@ -134,8 +133,7 @@ - if (adap = adapters[i]) + if (adap == adapters[i]) break; - if (I2C_ADAP_MAX = i) { + if (I2C_ADAP_MAX == i) { - printk( KERN_WARNING "i2c-core.o: unregister_adapter adap [%s] not found.\n", - adap->name); + dev_warn(&adap->dev, "unregister_adapter adap not found.\n"); @@ -358,7 +358,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c up(&core_lists); @@ -272,8 +270,7 @@ struct i2c_adapter *adap = adapters[k]; - if (adap = NULL) /* skip empty entries. */ + if (adap == NULL) /* skip empty entries. */ continue; - DEB2(printk(KERN_DEBUG "i2c-core.o: examining adapter %s:\n", - adap->name)); @@ -636,9 +636,9 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c iface->state = state_idle; iface->result = -EIO; @@ -331,13 +330,12 @@ - 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) { - printk(KERN_WARNING NAME ": %s, zero length read\n", - adapter->name); + dev_warn(&adapter->dev, "zero length read\n"); @@ -665,7 +665,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - sprintf(description, "NatSemi SCx200 ACCESS.bus [%s]", adapter->name); + snprintf(description, sizeof(description), "NatSemi SCx200 ACCESS.bus [%s]", adapter->dev.name); - if (request_region(base, 8, description) = 0) { + if (request_region(base, 8, description) == 0) { - printk(KERN_ERR NAME ": %s, can't allocate io 0x%x-0x%x\n", - adapter->name, base, base + 8-1); + dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n", @@ -698,6 +698,6 @@ diff -Nru a/include/linux/i2c.h b/include/linux/i2c.h struct i2c_adapter { struct module *owner; - char name[32]; /* some useful name to identify the adapter */ - unsigned int id;/* = is algo->id | hwdep.struct->id, */ + unsigned int id;/* == is algo->id | hwdep.struct->id, */ /* for registered values see below */ struct i2c_algorithm *algo;/* the algorithm to access the bus */ diff --git a/a/content_digest b/N1/content_digest index 15dd23c..d1fde4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01048295082521@kroah.com\0" - "ref\01048295086481@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] More i2c driver changes for 2.5.65\0" - "Date\0Thu, 19 May 2005 06:23:50 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] More i2c driver changes for 2.5.65\0" + "Date\0Fri, 21 Mar 2003 17:04 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -187,7 +186,7 @@ "-\t\t\t i2c_adap->name, c&0xff));\n" "+\t\tDEB2(dev_dbg(&i2c_adap->dev, \"sendbytes: writing %2.2X\\n\", c&0xff));\n" " \t\tretval = i2c_outb(i2c_adap,c);\n" - " \t\tif ((retval>0) || (nak_ok && (retval=0))) { /* ok or ignored NAK */\n" + " \t\tif ((retval>0) || (nak_ok && (retval==0))) { /* ok or ignored NAK */\n" " \t\t\tcount--; \n" " \t\t\ttemp++;\n" " \t\t\twrcount++;\n" @@ -292,9 +291,9 @@ " #include <linux/kernel.h>\n" " #include <linux/errno.h>\n" "@@ -82,9 +84,8 @@\n" - " \t\tif (NULL = adapters[i])\n" + " \t\tif (NULL == adapters[i])\n" " \t\t\tbreak;\n" - " \tif (I2C_ADAP_MAX = i) {\n" + " \tif (I2C_ADAP_MAX == i) {\n" "-\t\tprintk(KERN_WARNING \n" "-\t\t \" i2c-core.o: register_adapter(%s) - enlarge I2C_ADAP_MAX.\\n\",\n" "-\t\t\tadap->name);\n" @@ -304,7 +303,7 @@ " \t\tgoto out_unlock;\n" " \t}\n" "@@ -105,7 +106,6 @@\n" - " \tif (adap->dev.parent = NULL)\n" + " \tif (adap->dev.parent == NULL)\n" " \t\tadap->dev.parent = &legacy_bus;\n" " \tsprintf(adap->dev.bus_id, \"i2c-%d\", i);\n" "-\tstrcpy(adap->dev.name, \"i2c controller\");\n" @@ -322,9 +321,9 @@ " out_unlock:\n" " \tup(&core_lists);\n" "@@ -134,8 +133,7 @@\n" - " \t\tif (adap = adapters[i])\n" + " \t\tif (adap == adapters[i])\n" " \t\t\tbreak;\n" - " \tif (I2C_ADAP_MAX = i) {\n" + " \tif (I2C_ADAP_MAX == i) {\n" "-\t\tprintk( KERN_WARNING \"i2c-core.o: unregister_adapter adap [%s] not found.\\n\",\n" "-\t\t\tadap->name);\n" "+\t\tdev_warn(&adap->dev, \"unregister_adapter adap not found.\\n\");\n" @@ -367,7 +366,7 @@ " \tup(&core_lists);\n" "@@ -272,8 +270,7 @@\n" " \t\tstruct i2c_adapter *adap = adapters[k];\n" - " \t\tif (adap = NULL) /* skip empty entries. */\n" + " \t\tif (adap == NULL) /* skip empty entries. */\n" " \t\t\tcontinue;\n" "-\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: examining adapter %s:\\n\",\n" "-\t\t\t adap->name));\n" @@ -645,9 +644,9 @@ " \tiface->state = state_idle;\n" " \tiface->result = -EIO;\n" "@@ -331,13 +330,12 @@\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\tprintk(KERN_WARNING NAME \": %s, zero length read\\n\", \n" "-\t\t adapter->name);\n" "+\t\tdev_warn(&adapter->dev, \"zero length read\\n\");\n" @@ -674,7 +673,7 @@ " \n" "-\tsprintf(description, \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->name);\n" "+\tsnprintf(description, sizeof(description), \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->dev.name);\n" - " \tif (request_region(base, 8, description) = 0) {\n" + " \tif (request_region(base, 8, description) == 0) {\n" "-\t\tprintk(KERN_ERR NAME \": %s, can't allocate io 0x%x-0x%x\\n\", \n" "-\t\t adapter->name, base, base + 8-1);\n" "+\t\tdev_err(&adapter->dev, \"can't allocate io 0x%x-0x%x\\n\",\n" @@ -707,8 +706,8 @@ " struct i2c_adapter {\n" " \tstruct module *owner;\n" "-\tchar name[32];\t/* some useful name to identify the adapter\t*/\n" - " \tunsigned int id;/* = is algo->id | hwdep.struct->id, \t\t*/\n" + " \tunsigned int id;/* == is algo->id | hwdep.struct->id, \t\t*/\n" " \t\t\t/* for registered values see below\t\t*/\n" " \tstruct i2c_algorithm *algo;/* the algorithm to access the bus\t*/" -1139403ba30366e65041ff594469680ebb903fc64a355c5a5f5f84afbf9f5cf2 +5d5cb3326ca675038c3f67347a4f64f2034b04785faf8a2c3d61ba3655dfc2b0
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.