diff for duplicates of <10728219722179@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 45c59da..d23efa9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,11 +30,11 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c 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> */ - -/* $Id: i2c-algo-bit.c,v 1.44 2003/01/21 08:08:16 kmalkki Exp $ */ -+/* With some changes from Frodo Looijaard <frodol@dds.nl>, Ky?sti M?lkki ++/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki + <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ /* #define DEBUG 1 */ @@ -43,8 +43,8 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c setscl(adap,1); /* Not all adapters have scl sense line... */ -- if (adap->getscl = NULL ) -+ if (adap->getscl = NULL ) { +- if (adap->getscl == NULL ) ++ if (adap->getscl == NULL ) { + udelay(adap->udelay); return 0; + } @@ -56,19 +56,19 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c static int test_bus(struct i2c_algo_bit_data *adap, char* name) { int scl,sda; + -+ if (adap->getscl=NULL) ++ if (adap->getscl==NULL) + printk(KERN_INFO "i2c-algo-bit.o: Testing SDA only, " + "SCL is not readable.\n"); + sda=getsda(adap); -- if (adap->getscl=NULL) { +- if (adap->getscl==NULL) { - printk(KERN_WARNING "i2c-algo-bit.o: Warning: Adapter can't read from clock line - skipping test.\n"); - return 0; - } - scl=getscl(adap); - printk(KERN_INFO "i2c-algo-bit.o: Adapter: %s scl: %d sda: %d -- testing...\n", - name,getscl(adap),getsda(adap)); -+ scl=(adap->getscl=NULL?1:getscl(adap)); ++ scl=(adap->getscl==NULL?1:getscl(adap)); + printk(KERN_DEBUG "i2c-algo-bit.o: (0) scl=%d, sda=%d\n",scl,sda); if (!scl || !sda ) { - printk(KERN_INFO " i2c-algo-bit.o: %s seems to be busy.\n",name); @@ -83,16 +83,16 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c - printk(KERN_WARNING "i2c-algo-bit.o: %s SDA stuck high!\n",name); - sdahi(adap); + sda=getsda(adap); -+ scl=(adap->getscl=NULL?1:getscl(adap)); ++ scl=(adap->getscl==NULL?1:getscl(adap)); + printk(KERN_DEBUG "i2c-algo-bit.o: (1) scl=%d, sda=%d\n",scl,sda); + if ( 0 != sda ) { + printk(KERN_WARNING "i2c-algo-bit.o: SDA stuck high!\n"); goto bailout; } -- if ( 0 = getscl(adap) ) { +- if ( 0 == getscl(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SCL unexpected low while pulling SDA low!\n", - name); -+ if ( 0 = scl ) { ++ if ( 0 == scl ) { + printk(KERN_WARNING "i2c-algo-bit.o: SCL unexpected low " + "while pulling SDA low!\n"); goto bailout; @@ -101,21 +101,21 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c sdahi(adap); - printk(KERN_DEBUG "i2c-algo-bit.o:2 scl: %d sda: %d \n",getscl(adap), - getsda(adap)); -- if ( 0 = getsda(adap) ) { +- if ( 0 == getsda(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SDA stuck low!\n",name); - sdahi(adap); + sda=getsda(adap); -+ scl=(adap->getscl=NULL?1:getscl(adap)); ++ scl=(adap->getscl==NULL?1:getscl(adap)); + printk(KERN_DEBUG "i2c-algo-bit.o: (2) scl=%d, sda=%d\n",scl,sda); -+ if ( 0 = sda ) { ++ if ( 0 == sda ) { + printk(KERN_WARNING "i2c-algo-bit.o: SDA stuck low!\n"); goto bailout; } -- if ( 0 = getscl(adap) ) { +- if ( 0 == getscl(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SCL unexpected low while SDA high!\n", - name); - goto bailout; -+ if ( 0 = scl ) { ++ if ( 0 == scl ) { + printk(KERN_WARNING "i2c-algo-bit.o: SCL unexpected low " + "while pulling SDA high!\n"); + goto bailout; @@ -128,16 +128,16 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c - printk(KERN_WARNING "i2c-algo-bit.o: %s SCL stuck high!\n",name); - sclhi(adap); + sda=getsda(adap); -+ scl=(adap->getscl=NULL?0:getscl(adap)); ++ scl=(adap->getscl==NULL?0:getscl(adap)); + printk(KERN_DEBUG "i2c-algo-bit.o: (3) scl=%d, sda=%d\n",scl,sda); + if ( 0 != scl ) { + printk(KERN_WARNING "i2c-algo-bit.o: SCL stuck high!\n"); goto bailout; } -- if ( 0 = getsda(adap) ) { +- if ( 0 == getsda(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SDA unexpected low while pulling SCL low!\n", - name); -+ if ( 0 = sda ) { ++ if ( 0 == sda ) { + printk(KERN_WARNING "i2c-algo-bit.o: SDA unexpected low " + "while pulling SCL low!\n"); goto bailout; @@ -146,20 +146,20 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c sclhi(adap); - printk(KERN_DEBUG "i2c-algo-bit.o:4 scl: %d sda: %d \n",getscl(adap), - getsda(adap)); -- if ( 0 = getscl(adap) ) { +- if ( 0 == getscl(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SCL stuck low!\n",name); - sclhi(adap); + sda=getsda(adap); -+ scl=(adap->getscl=NULL?1:getscl(adap)); ++ scl=(adap->getscl==NULL?1:getscl(adap)); + printk(KERN_DEBUG "i2c-algo-bit.o: (4) scl=%d, sda=%d\n",scl,sda); -+ if ( 0 = scl ) { ++ if ( 0 == scl ) { + printk(KERN_WARNING "i2c-algo-bit.o: SCL stuck low!\n"); goto bailout; } -- if ( 0 = getsda(adap) ) { +- if ( 0 == getsda(adap) ) { - printk(KERN_WARNING "i2c-algo-bit.o: %s SDA unexpected low while SCL high!\n", - name); -+ if ( 0 = sda ) { ++ if ( 0 == sda ) { + printk(KERN_WARNING "i2c-algo-bit.o: SDA unexpected low " + "while pulling SCL high!\n"); goto bailout; diff --git a/a/content_digest b/N1/content_digest index 3ff3596..deee4d9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01072821972731@kroah.com\0" - "ref\010728219692713@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0\0" - "Date\0Thu, 19 May 2005 06:24:32 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0\0" + "Date\0Tue, 30 Dec 2003 14:06:12 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -39,11 +38,11 @@ " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\t\t */\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" "-/* $Id: i2c-algo-bit.c,v 1.44 2003/01/21 08:08:16 kmalkki Exp $ */\n" - "+/* With some changes from Frodo Looijaard <frodol@dds.nl>, Ky?sti M?lkki\n" + "+/* With some changes from Frodo Looijaard <frodol@dds.nl>, Ky\303\266sti M\303\244lkki\n" "+ <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */\n" " \n" " /* #define DEBUG 1 */\n" @@ -52,8 +51,8 @@ " \tsetscl(adap,1);\n" " \n" " \t/* Not all adapters have scl sense line... */\n" - "-\tif (adap->getscl = NULL )\n" - "+\tif (adap->getscl = NULL ) {\n" + "-\tif (adap->getscl == NULL )\n" + "+\tif (adap->getscl == NULL ) {\n" "+\t\tudelay(adap->udelay);\n" " \t\treturn 0;\n" "+\t}\n" @@ -65,19 +64,19 @@ " static int test_bus(struct i2c_algo_bit_data *adap, char* name) {\n" " \tint scl,sda;\n" "+\n" - "+\tif (adap->getscl=NULL)\n" + "+\tif (adap->getscl==NULL)\n" "+\t\tprintk(KERN_INFO \"i2c-algo-bit.o: Testing SDA only, \"\n" "+\t\t\t\"SCL is not readable.\\n\");\n" "+\n" " \tsda=getsda(adap);\n" - "-\tif (adap->getscl=NULL) {\n" + "-\tif (adap->getscl==NULL) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: Warning: Adapter can't read from clock line - skipping test.\\n\");\n" "-\t\treturn 0;\t\t\n" "-\t}\n" "-\tscl=getscl(adap);\n" "-\tprintk(KERN_INFO \"i2c-algo-bit.o: Adapter: %s scl: %d sda: %d -- testing...\\n\",\n" "-\t name,getscl(adap),getsda(adap));\n" - "+\tscl=(adap->getscl=NULL?1:getscl(adap));\n" + "+\tscl=(adap->getscl==NULL?1:getscl(adap));\n" "+\tprintk(KERN_DEBUG \"i2c-algo-bit.o: (0) scl=%d, sda=%d\\n\",scl,sda);\n" " \tif (!scl || !sda ) {\n" "-\t\tprintk(KERN_INFO \" i2c-algo-bit.o: %s seems to be busy.\\n\",name);\n" @@ -92,16 +91,16 @@ "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SDA stuck high!\\n\",name);\n" "-\t\tsdahi(adap);\n" "+\tsda=getsda(adap);\n" - "+\tscl=(adap->getscl=NULL?1:getscl(adap));\n" + "+\tscl=(adap->getscl==NULL?1:getscl(adap));\n" "+\tprintk(KERN_DEBUG \"i2c-algo-bit.o: (1) scl=%d, sda=%d\\n\",scl,sda);\n" "+\tif ( 0 != sda ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SDA stuck high!\\n\");\n" " \t\tgoto bailout;\n" " \t}\n" - "-\tif ( 0 = getscl(adap) ) {\n" + "-\tif ( 0 == getscl(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SCL unexpected low while pulling SDA low!\\n\",\n" "-\t\t\tname);\n" - "+\tif ( 0 = scl ) {\n" + "+\tif ( 0 == scl ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SCL unexpected low \"\n" "+\t\t\t\"while pulling SDA low!\\n\");\n" " \t\tgoto bailout;\n" @@ -110,21 +109,21 @@ " \tsdahi(adap);\n" "-\tprintk(KERN_DEBUG \"i2c-algo-bit.o:2 scl: %d sda: %d \\n\",getscl(adap),\n" "-\t getsda(adap));\n" - "-\tif ( 0 = getsda(adap) ) {\n" + "-\tif ( 0 == getsda(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SDA stuck low!\\n\",name);\n" "-\t\tsdahi(adap);\n" "+\tsda=getsda(adap);\n" - "+\tscl=(adap->getscl=NULL?1:getscl(adap));\n" + "+\tscl=(adap->getscl==NULL?1:getscl(adap));\n" "+\tprintk(KERN_DEBUG \"i2c-algo-bit.o: (2) scl=%d, sda=%d\\n\",scl,sda);\n" - "+\tif ( 0 = sda ) {\n" + "+\tif ( 0 == sda ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SDA stuck low!\\n\");\n" " \t\tgoto bailout;\n" " \t}\n" - "-\tif ( 0 = getscl(adap) ) {\n" + "-\tif ( 0 == getscl(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SCL unexpected low while SDA high!\\n\",\n" "-\t\t name);\n" "-\tgoto bailout;\n" - "+\tif ( 0 = scl ) {\n" + "+\tif ( 0 == scl ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SCL unexpected low \"\n" "+\t\t\t\"while pulling SDA high!\\n\");\n" "+\t\tgoto bailout;\n" @@ -137,16 +136,16 @@ "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SCL stuck high!\\n\",name);\n" "-\t\tsclhi(adap);\n" "+\tsda=getsda(adap);\n" - "+\tscl=(adap->getscl=NULL?0:getscl(adap));\n" + "+\tscl=(adap->getscl==NULL?0:getscl(adap));\n" "+\tprintk(KERN_DEBUG \"i2c-algo-bit.o: (3) scl=%d, sda=%d\\n\",scl,sda);\n" "+\tif ( 0 != scl ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SCL stuck high!\\n\");\n" " \t\tgoto bailout;\n" " \t}\n" - "-\tif ( 0 = getsda(adap) ) {\n" + "-\tif ( 0 == getsda(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SDA unexpected low while pulling SCL low!\\n\",\n" "-\t\t\tname);\n" - "+\tif ( 0 = sda ) {\n" + "+\tif ( 0 == sda ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SDA unexpected low \"\n" "+\t\t\t\"while pulling SCL low!\\n\");\n" " \t\tgoto bailout;\n" @@ -155,24 +154,24 @@ " \tsclhi(adap);\n" "-\tprintk(KERN_DEBUG \"i2c-algo-bit.o:4 scl: %d sda: %d \\n\",getscl(adap),\n" "-\t getsda(adap));\n" - "-\tif ( 0 = getscl(adap) ) {\n" + "-\tif ( 0 == getscl(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SCL stuck low!\\n\",name);\n" "-\t\tsclhi(adap);\n" "+\tsda=getsda(adap);\n" - "+\tscl=(adap->getscl=NULL?1:getscl(adap));\n" + "+\tscl=(adap->getscl==NULL?1:getscl(adap));\n" "+\tprintk(KERN_DEBUG \"i2c-algo-bit.o: (4) scl=%d, sda=%d\\n\",scl,sda);\n" - "+\tif ( 0 = scl ) {\n" + "+\tif ( 0 == scl ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SCL stuck low!\\n\");\n" " \t\tgoto bailout;\n" " \t}\n" - "-\tif ( 0 = getsda(adap) ) {\n" + "-\tif ( 0 == getsda(adap) ) {\n" "-\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: %s SDA unexpected low while SCL high!\\n\",\n" "-\t\t\tname);\n" - "+\tif ( 0 = sda ) {\n" + "+\tif ( 0 == sda ) {\n" "+\t\tprintk(KERN_WARNING \"i2c-algo-bit.o: SDA unexpected low \"\n" "+\t\t\t\"while pulling SCL high!\\n\");\n" " \t\tgoto bailout;\n" " \t}\n" " \tprintk(KERN_INFO \"i2c-algo-bit.o: %s passed test.\\n\",name);" -66c7b079a86175156f2f926d3907f1971ce31338fbb76a27f3b1a0c8e262a882 +c84b9594019286400f0e4796f7581e15b55db099d21d7bab6d0ff62a5d0679e7
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.