diff for duplicates of <10642734211077@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 5f61cc2..fa44d9b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - Copyright (C) 1995-1997 Simon G. Vogl - 1998-2000 Hans Berglund - -- With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and +- With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and - Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey - <mbailey@littlefeet-inc.com> - @@ -98,7 +98,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - Version 02/03/25 - Armin - converted to ocp format - removed commented out or #if 0 code -- added G?rard Basler's fix to iic_combined_transaction() such that it +- added Gérard Basler's fix to iic_combined_transaction() such that it - returns the number of successfully completed transfers . -*/ - @@ -341,12 +341,12 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - iic = (struct iic_regs *) adap_priv_data->iic_base; - - -- if( count = 0 ) return 0; +- if( count == 0 ) return 0; - wrcount = 0; - loops = count / 4; - remainder = count % 4; - -- if((loops > 1) && (remainder = 0)) { +- if((loops > 1) && (remainder == 0)) { - for(i=0; i<(loops-1); i++) { - // - // Write four bytes to master data buffer @@ -374,7 +374,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) { +- if(error_code == IIC_ERR_INCOMPLETE_XFR) { - // Return the number of bytes transferred - ret = iic_inb(adap, iic->xfrcnt); - ret = ret & 0x07; @@ -413,7 +413,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) { +- if(error_code == IIC_ERR_INCOMPLETE_XFR) { - // Return the number of bytes transferred - ret = iic_inb(adap, iic->xfrcnt); - ret = ret & 0x07; @@ -425,7 +425,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - - //printk(KERN_DEBUG "iic_sendbytes: expedite write\n"); -- if(remainder = 0) remainder = 4; +- if(remainder == 0) remainder = 4; - // remainder = remainder - 1; - // - // Write the remaining bytes (less than or equal to 4) @@ -436,7 +436,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - //printk(KERN_DEBUG "iic_sendbytes: Issuing write\n"); - -- if(xfer_flag = IIC_COMBINED_XFER) { +- if(xfer_flag == IIC_COMBINED_XFER) { - iic_outb(adap, iic->cntl, (0x09 | ((remainder-1) << 4))); - } - else { @@ -453,7 +453,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) { +- if(error_code == IIC_ERR_INCOMPLETE_XFR) { - // Return the number of bytes transferred - ret = iic_inb(adap, iic->xfrcnt); - ret = ret & 0x07; @@ -480,14 +480,14 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - int ret, error_code; - iic = (struct iic_regs *) adap_priv_data->iic_base; - -- if(count = 0) return 0; +- if(count == 0) return 0; - loops = count / 4; - remainder = count % 4; - - //printk(KERN_DEBUG "iic_readbytes: loops = %d, remainder = %d\n", loops, remainder); - -- if((loops > 1) && (remainder = 0)) { -- //printk(KERN_DEBUG "iic_readbytes: (loops > 1) && (remainder = 0)\n"); +- if((loops > 1) && (remainder == 0)) { +- //printk(KERN_DEBUG "iic_readbytes: (loops > 1) && (remainder == 0)\n"); - for(i=0; i<(loops-1); i++) { - // - // Issue command to begin master read (4 bytes maximum) @@ -510,7 +510,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) +- if(error_code == IIC_ERR_INCOMPLETE_XFR) - return rdcount; - else - return error_code; @@ -551,7 +551,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) +- if(error_code == IIC_ERR_INCOMPLETE_XFR) - return rdcount; - else - return error_code; @@ -569,10 +569,10 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - } - - //printk(KERN_DEBUG "iic_readbytes: expedite read\n"); -- if(remainder = 0) remainder = 4; +- if(remainder == 0) remainder = 4; - DEB2(printk(KERN_DEBUG "iic_readbytes: writing %x to IICO_CNTL\n", (0x03 | ((remainder-1) << 4)))); - -- if(xfer_type = IIC_COMBINED_XFER) { +- if(xfer_type == IIC_COMBINED_XFER) { - iic_outb(adap, iic->cntl, (0x0b | ((remainder-1) << 4))); - } - else { @@ -589,7 +589,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - - ret = analyze_status(adap, &error_code); - if(ret < 0) { -- if(error_code = IIC_ERR_INCOMPLETE_XFR) +- if(error_code == IIC_ERR_INCOMPLETE_XFR) - return rdcount; - else - return error_code; @@ -768,7 +768,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - // Wait for any pending transfers to complete - // - DEB2(printk(KERN_DEBUG "iic_xfer: Waiting for any pending transfers to complete\n")); -- while((ret = iic_inb(adap, iic->sts)) = 0x01) { +- while((ret = iic_inb(adap, iic->sts)) == 0x01) { - ; - } - @@ -804,7 +804,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - // - // Read only - // -- else if((num = 1) && (pmsg->flags & I2C_M_RD)) { +- else if((num == 1) && (pmsg->flags & I2C_M_RD)) { - // - // Tell device to begin reading data from the master data - // @@ -814,7 +814,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - // - // Write only - // -- else if((num = 1 ) && (!(pmsg->flags & I2C_M_RD))) { +- else if((num == 1 ) && (!(pmsg->flags & I2C_M_RD))) { - // - // Write data to master data buffers and tell our device - // to begin transmitting @@ -848,31 +848,31 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.c b/drivers/i2c/i2c-algo-ibm_ocp.c - - lines = iic_inb(adap, iic->directcntl); - -- if (cmd = IICO_I2C_SDAHIGH) { +- if (cmd == IICO_I2C_SDAHIGH) { - lines = lines & 0x01; - if( lines ) lines = 0x04; - else lines = 0; - iic_outb(adap, iic->directcntl,(0x08|lines)); - } -- else if (cmd = IICO_I2C_SDALOW) { +- else if (cmd == IICO_I2C_SDALOW) { - lines = lines & 0x01; - if( lines ) lines = 0x04; - else lines = 0; - iic_outb(adap, iic->directcntl,(0x00|lines)); - } -- else if (cmd = IICO_I2C_SCLHIGH) { +- else if (cmd == IICO_I2C_SCLHIGH) { - lines = lines & 0x02; - if( lines ) lines = 0x08; - else lines = 0; - iic_outb(adap, iic->directcntl,(0x04|lines)); - } -- else if (cmd = IICO_I2C_SCLLOW) { +- else if (cmd == IICO_I2C_SCLLOW) { - lines = lines & 0x02; - if( lines ) lines = 0x08; - else lines = 0; - iic_outb(adap, iic->directcntl,(0x00|lines)); - } -- else if (cmd = IICO_I2C_LINEREAD) { +- else if (cmd == IICO_I2C_LINEREAD) { - ret = lines; - } - return ret; @@ -975,7 +975,7 @@ diff -Nru a/drivers/i2c/i2c-algo-ibm_ocp.h b/drivers/i2c/i2c-algo-ibm_ocp.h - 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> */ - -/* Modifications by MontaVista Software, August 2000 @@ -1033,7 +1033,7 @@ diff -Nru a/drivers/i2c/i2c-ibm_iic.c b/drivers/i2c/i2c-ibm_iic.c + * Copyright 1995-97 Simon G. Vogl + * 1998-99 Hans Berglund + * -+ * With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> ++ * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> + * and even Frodo Looijaard <frodol@dds.nl> + * + * This program is free software; you can redistribute it and/or modify it @@ -1549,7 +1549,7 @@ diff -Nru a/drivers/i2c/i2c-ibm_iic.c b/drivers/i2c/i2c-ibm_iic.c + printk(KERN_INFO "ibm-iic%d: scanning bus...\n" KERN_INFO, dev->idx); + + for (msg.addr = 8; msg.addr < 0x78; ++msg.addr) -+ if (iic_xfer(&dev->adap, &msg, 1) = 1){ ++ if (iic_xfer(&dev->adap, &msg, 1) == 1){ + ++found; + printk(" 0x%02x", msg.addr); + } @@ -1689,7 +1689,7 @@ diff -Nru a/drivers/i2c/i2c-ibm_iic.c b/drivers/i2c/i2c-ibm_iic.c +static void __devexit iic_remove(struct ocp_device *ocp) +{ + struct ibm_iic_private* dev = (struct ibm_iic_private*)ocp_get_drvdata(ocp); -+ BUG_ON(dev = NULL); ++ BUG_ON(dev == NULL); + if (i2c_del_adapter(&dev->adap)){ + printk(KERN_CRIT "ibm-iic%d: failed to delete i2c adapter :(\n", + dev->idx); @@ -1717,7 +1717,8 @@ diff -Nru a/drivers/i2c/i2c-ibm_iic.c b/drivers/i2c/i2c-ibm_iic.c + +MODULE_DEVICE_TABLE(ocp, ibm_iic_ids); + -+static struct ocp_driver ibm_iic_driver +{ ++static struct ocp_driver ibm_iic_driver = ++{ + .name = "ocp_iic", + .id_table = ibm_iic_ids, + .probe = iic_probe, @@ -1866,6 +1867,6 @@ diff -Nru a/drivers/i2c/i2c-ibm_iic.h b/drivers/i2c/i2c-ibm_iic.h +#define DIRCNTL_MSC 0x01 + +/* Check if we really control the I2C bus and bus is free */ -+#define DIRCTNL_FREE(v) (((v) & 0x0f) = 0x0f) ++#define DIRCTNL_FREE(v) (((v) & 0x0f) == 0x0f) + +#endif /* __I2C_IBM_IIC_H_ */ diff --git a/a/content_digest b/N1/content_digest index a6d6c69..e13dee9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734213872@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:21 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -80,7 +79,7 @@ "- Copyright (C) 1995-1997 Simon G. Vogl\n" "- 1998-2000 Hans Berglund\n" "-\n" - "- With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and \n" + "- With some changes from Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi> and \n" "- Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey\n" "- <mbailey@littlefeet-inc.com>\n" "-\n" @@ -107,7 +106,7 @@ "- Version 02/03/25 - Armin\n" "- converted to ocp format\n" "- removed commented out or #if 0 code\n" - "- added G?rard Basler's fix to iic_combined_transaction() such that it \n" + "- added G\303\251rard Basler's fix to iic_combined_transaction() such that it \n" "- returns the number of successfully completed transfers .\n" "-*/\n" "-\n" @@ -350,12 +349,12 @@ "- \tiic = (struct iic_regs *) adap_priv_data->iic_base;\n" "-\n" "- \n" - "-\tif( count = 0 ) return 0;\n" + "-\tif( count == 0 ) return 0;\n" "-\twrcount = 0;\n" "-\tloops = count / 4;\n" "-\tremainder = count % 4;\n" "-\n" - "-\tif((loops > 1) && (remainder = 0)) {\n" + "-\tif((loops > 1) && (remainder == 0)) {\n" "-\t for(i=0; i<(loops-1); i++) {\n" "- \t //\n" "- \t // Write four bytes to master data buffer\n" @@ -383,7 +382,7 @@ "-\t }\n" "-\t ret = analyze_status(adap, &error_code);\n" "-\t if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR) {\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR) {\n" "- // Return the number of bytes transferred\n" "- ret = iic_inb(adap, iic->xfrcnt);\n" "- ret = ret & 0x07;\n" @@ -422,7 +421,7 @@ "- }\n" "- ret = analyze_status(adap, &error_code);\n" "- if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR) {\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR) {\n" "- // Return the number of bytes transferred\n" "- ret = iic_inb(adap, iic->xfrcnt);\n" "- ret = ret & 0x07;\n" @@ -434,7 +433,7 @@ "- }\n" "-\n" "-\t//printk(KERN_DEBUG \"iic_sendbytes: expedite write\\n\");\n" - "-\tif(remainder = 0) remainder = 4;\n" + "-\tif(remainder == 0) remainder = 4;\n" "-\t// remainder = remainder - 1;\n" "-\t//\n" "-\t// Write the remaining bytes (less than or equal to 4)\n" @@ -445,7 +444,7 @@ "-\t}\n" "- //printk(KERN_DEBUG \"iic_sendbytes: Issuing write\\n\");\n" "-\n" - "- if(xfer_flag = IIC_COMBINED_XFER) {\n" + "- if(xfer_flag == IIC_COMBINED_XFER) {\n" "- iic_outb(adap, iic->cntl, (0x09 | ((remainder-1) << 4)));\n" "- }\n" "-\telse {\n" @@ -462,7 +461,7 @@ "- }\n" "- ret = analyze_status(adap, &error_code);\n" "- if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR) {\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR) {\n" "- // Return the number of bytes transferred\n" "- ret = iic_inb(adap, iic->xfrcnt);\n" "- ret = ret & 0x07;\n" @@ -489,14 +488,14 @@ "- int ret, error_code;\n" "-\tiic = (struct iic_regs *) adap_priv_data->iic_base;\n" "-\n" - "-\tif(count = 0) return 0;\n" + "-\tif(count == 0) return 0;\n" "-\tloops = count / 4;\n" "-\tremainder = count % 4;\n" "-\n" "-\t//printk(KERN_DEBUG \"iic_readbytes: loops = %d, remainder = %d\\n\", loops, remainder);\n" "-\n" - "-\tif((loops > 1) && (remainder = 0)) {\n" - "-\t//printk(KERN_DEBUG \"iic_readbytes: (loops > 1) && (remainder = 0)\\n\");\n" + "-\tif((loops > 1) && (remainder == 0)) {\n" + "-\t//printk(KERN_DEBUG \"iic_readbytes: (loops > 1) && (remainder == 0)\\n\");\n" "-\t for(i=0; i<(loops-1); i++) {\n" "-\t //\n" "- // Issue command to begin master read (4 bytes maximum)\n" @@ -519,7 +518,7 @@ "-\n" "- ret = analyze_status(adap, &error_code);\n" "-\t if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR)\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR)\n" "- return rdcount;\n" "- else\n" "- return error_code;\n" @@ -560,7 +559,7 @@ "-\n" "- ret = analyze_status(adap, &error_code);\n" "- if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR)\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR)\n" "- return rdcount;\n" "- else\n" "- return error_code;\n" @@ -578,10 +577,10 @@ "- }\n" "-\n" "-\t//printk(KERN_DEBUG \"iic_readbytes: expedite read\\n\");\n" - "-\tif(remainder = 0) remainder = 4;\n" + "-\tif(remainder == 0) remainder = 4;\n" "-\tDEB2(printk(KERN_DEBUG \"iic_readbytes: writing %x to IICO_CNTL\\n\", (0x03 | ((remainder-1) << 4))));\n" "-\n" - "-\tif(xfer_type = IIC_COMBINED_XFER) {\n" + "-\tif(xfer_type == IIC_COMBINED_XFER) {\n" "-\t iic_outb(adap, iic->cntl, (0x0b | ((remainder-1) << 4)));\n" "- }\n" "- else {\n" @@ -598,7 +597,7 @@ "-\n" "- ret = analyze_status(adap, &error_code);\n" "- if(ret < 0) {\n" - "- if(error_code = IIC_ERR_INCOMPLETE_XFR)\n" + "- if(error_code == IIC_ERR_INCOMPLETE_XFR)\n" "- return rdcount;\n" "- else\n" "- return error_code;\n" @@ -777,7 +776,7 @@ "-\t// Wait for any pending transfers to complete\n" "-\t//\n" "-\tDEB2(printk(KERN_DEBUG \"iic_xfer: Waiting for any pending transfers to complete\\n\"));\n" - "-\twhile((ret = iic_inb(adap, iic->sts)) = 0x01) {\n" + "-\twhile((ret = iic_inb(adap, iic->sts)) == 0x01) {\n" "-\t\t;\n" "-\t}\n" "-\n" @@ -813,7 +812,7 @@ "-\t//\n" "-\t// Read only\n" "-\t//\n" - "-\telse if((num = 1) && (pmsg->flags & I2C_M_RD)) {\n" + "-\telse if((num == 1) && (pmsg->flags & I2C_M_RD)) {\n" "-\t //\n" "-\t // Tell device to begin reading data from the master data \n" "-\t //\n" @@ -823,7 +822,7 @@ "- //\n" "-\t// Write only\n" "-\t//\n" - "-\telse if((num = 1 ) && (!(pmsg->flags & I2C_M_RD))) {\n" + "-\telse if((num == 1 ) && (!(pmsg->flags & I2C_M_RD))) {\n" "-\t //\n" "-\t // Write data to master data buffers and tell our device\n" "-\t // to begin transmitting\n" @@ -857,31 +856,31 @@ "-\n" "-\tlines = iic_inb(adap, iic->directcntl);\n" "-\n" - "-\tif (cmd = IICO_I2C_SDAHIGH) {\n" + "-\tif (cmd == IICO_I2C_SDAHIGH) {\n" "-\t lines = lines & 0x01;\n" "-\t if( lines ) lines = 0x04;\n" "-\t else lines = 0;\n" "-\t iic_outb(adap, iic->directcntl,(0x08|lines));\n" "-\t}\n" - "-\telse if (cmd = IICO_I2C_SDALOW) {\n" + "-\telse if (cmd == IICO_I2C_SDALOW) {\n" "-\t lines = lines & 0x01;\n" "-\t if( lines ) lines = 0x04;\n" "- else lines = 0;\n" "- iic_outb(adap, iic->directcntl,(0x00|lines));\n" "-\t}\n" - "-\telse if (cmd = IICO_I2C_SCLHIGH) {\n" + "-\telse if (cmd == IICO_I2C_SCLHIGH) {\n" "- lines = lines & 0x02;\n" "- if( lines ) lines = 0x08;\n" "- else lines = 0;\n" "- iic_outb(adap, iic->directcntl,(0x04|lines));\n" "-\t}\n" - "-\telse if (cmd = IICO_I2C_SCLLOW) {\n" + "-\telse if (cmd == IICO_I2C_SCLLOW) {\n" "- lines = lines & 0x02;\n" "-\t if( lines ) lines = 0x08;\n" "- else lines = 0;\n" "- iic_outb(adap, iic->directcntl,(0x00|lines));\n" "-\t}\n" - "-\telse if (cmd = IICO_I2C_LINEREAD) {\n" + "-\telse if (cmd == IICO_I2C_LINEREAD) {\n" "-\t ret = lines;\n" "-\t}\n" "-\treturn ret;\n" @@ -984,7 +983,7 @@ "- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */\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" "-/* Modifications by MontaVista Software, August 2000\n" @@ -1042,7 +1041,7 @@ "+ * \tCopyright 1995-97 Simon G. Vogl\n" "+ * 1998-99 Hans Berglund\n" "+ *\n" - "+ * \tWith some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> \n" + "+ * \tWith some changes from Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi> \n" "+ *\tand even Frodo Looijaard <frodol@dds.nl>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify it\n" @@ -1558,7 +1557,7 @@ "+\tprintk(KERN_INFO \"ibm-iic%d: scanning bus...\\n\" KERN_INFO, dev->idx);\n" "+\t\n" "+\tfor (msg.addr = 8; msg.addr < 0x78; ++msg.addr)\n" - "+\t\tif (iic_xfer(&dev->adap, &msg, 1) = 1){\n" + "+\t\tif (iic_xfer(&dev->adap, &msg, 1) == 1){\n" "+\t\t\t++found;\n" "+\t\t\tprintk(\" 0x%02x\", msg.addr);\n" "+\t\t}\n" @@ -1698,7 +1697,7 @@ "+static void __devexit iic_remove(struct ocp_device *ocp)\n" "+{\n" "+\tstruct ibm_iic_private* dev = (struct ibm_iic_private*)ocp_get_drvdata(ocp);\n" - "+\tBUG_ON(dev = NULL);\n" + "+\tBUG_ON(dev == NULL);\n" "+\tif (i2c_del_adapter(&dev->adap)){\n" "+\t\tprintk(KERN_CRIT \"ibm-iic%d: failed to delete i2c adapter :(\\n\",\n" "+\t\t\tdev->idx);\n" @@ -1726,7 +1725,8 @@ "+\n" "+MODULE_DEVICE_TABLE(ocp, ibm_iic_ids);\n" "+\n" - "+static struct ocp_driver ibm_iic_driver +{\n" + "+static struct ocp_driver ibm_iic_driver =\n" + "+{\n" "+\t.name \t\t= \"ocp_iic\",\n" "+\t.id_table\t= ibm_iic_ids,\n" "+\t.probe\t\t= iic_probe,\n" @@ -1875,8 +1875,8 @@ "+#define DIRCNTL_MSC\t0x01\n" "+\n" "+/* Check if we really control the I2C bus and bus is free */\n" - "+#define DIRCTNL_FREE(v)\t(((v) & 0x0f) = 0x0f)\n" + "+#define DIRCTNL_FREE(v)\t(((v) & 0x0f) == 0x0f)\n" "+\n" +#endif /* __I2C_IBM_IIC_H_ */ -a52f69bea28b77670c1c686db73a64031f266fb31f1cba58e6d042f3d025731d +07bebd3c170d19bd5e75a170496b14f07c25ab4e02aa6e6471fd5b49d1efc468
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.