diff for duplicates of <1055363806450@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 1071f53..353e488 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,7 +65,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + + Copyright (C) 1995-1997 Simon G. Vogl, 1998-2000 Hans Berglund + -+ And which acknowledged Ky?sti M?lkki <kmalkki@cc.hut.fi>, ++ And which acknowledged Kyösti Mälkki <kmalkki@cc.hut.fi>, + Frodo Looijaard <frodol@dds.nl>, Martin Bailey<mbailey@littlefeet-inc.com> + + ---------------------------------------------------------------------------*/ @@ -256,7 +256,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + * Concrete CompareFuncs + */ +static int all_bits_clear( unsigned test, unsigned mask ) { -+ return (test&mask) = 0; ++ return (test&mask) == 0; +} +static int any_bits_set( unsigned test, unsigned mask ) { + return (test&mask) != 0; @@ -294,7 +294,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c +// +static int iop3xx_adap_init (struct i2c_algo_iop3xx_data *iop3xx_adap) +{ -+ *IOP321_GPOD &= ~(iop3xx_adap->channel=0? ++ *IOP321_GPOD &= ~(iop3xx_adap->channel==0? + IOP321_GPOD_I2C0: + IOP321_GPOD_I2C1); + @@ -322,7 +322,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c +/* this assert fires every time, contrary to IOP manual + PASSERT( (status&IOP321_ISR_UNITBUSY)!=0 ); +*/ -+ PASSERT( (status&IOP321_ISR_RXREAD)=0 ); ++ PASSERT( (status&IOP321_ISR_RXREAD)==0 ); + + return rc; +} @@ -378,8 +378,8 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + int ii; + int rc = 0; + -+ for ( ii = 0; rc = 0 && ii != count; ++ii ){ -+ rc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii=count-1); ++ for ( ii = 0; rc == 0 && ii != count; ++ii ){ ++ rc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii==count-1); + } + return rc; +} @@ -392,8 +392,8 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + int ii; + int rc = 0; + -+ for ( ii = 0; rc = 0 && ii != count; ++ii ){ -+ rc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii=count-1); ++ for ( ii = 0; rc == 0 && ii != count; ++ii ){ ++ rc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii==count-1); + } + return rc; +} @@ -442,7 +442,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + iop3xx_adap_reset( iop3xx_adap ); + iop3xx_adap_enable( iop3xx_adap ); + -+ for ( im = 0; ret = 0 && im != num; ++im ){ ++ for ( im = 0; ret == 0 && im != num; ++im ){ + ret = iop3xx_handle_msg( i2c_adap, &msgs[im] ); + } + @@ -633,7 +633,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.h b/drivers/i2c/i2c-iop3xx.h +/* + * iop321 hardware bit definitions + */ -+#define IOP321_ICR_FAST_MODE 0x8000 /* 1@0kBps, 0\x100kBps */ ++#define IOP321_ICR_FAST_MODE 0x8000 /* 1=400kBps, 0=100kBps */ +#define IOP321_ICR_UNIT_RESET 0x4000 /* 1=RESET */ +#define IOP321_ICR_SADIE 0x2000 /* 1=Slave Detect Interrupt Enable */ +#define IOP321_ICR_ALDIE 0x1000 /* 1=Arb Loss Detect Interrupt Enable */ diff --git a/a/content_digest b/N1/content_digest index 54d8742..25d2f6d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010553638062379@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.70\0" - "Date\0Thu, 19 May 2005 06:23:59 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] More i2c driver changes for 2.5.70\0" + "Date\0Wed, 11 Jun 2003 13:36:46 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -74,7 +73,7 @@ "+\n" "+ Copyright (C) 1995-1997 Simon G. Vogl, 1998-2000 Hans Berglund\n" "+ \n" - "+ And which acknowledged Ky?sti M?lkki <kmalkki@cc.hut.fi>,\n" + "+ And which acknowledged Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi>,\n" "+ Frodo Looijaard <frodol@dds.nl>, Martin Bailey<mbailey@littlefeet-inc.com>\n" "+\n" "+ ---------------------------------------------------------------------------*/\n" @@ -265,7 +264,7 @@ "+ * Concrete CompareFuncs \n" "+ */\n" "+static int all_bits_clear( unsigned test, unsigned mask ) {\n" - "+\treturn (test&mask) = 0;\n" + "+\treturn (test&mask) == 0;\n" "+}\n" "+static int any_bits_set( unsigned test, unsigned mask ) {\n" "+\treturn (test&mask) != 0;\n" @@ -303,7 +302,7 @@ "+//\n" "+static int iop3xx_adap_init (struct i2c_algo_iop3xx_data *iop3xx_adap)\n" "+{\n" - "+\t*IOP321_GPOD &= ~(iop3xx_adap->channel=0?\n" + "+\t*IOP321_GPOD &= ~(iop3xx_adap->channel==0?\n" "+\t\t\t IOP321_GPOD_I2C0:\n" "+\t\t\t IOP321_GPOD_I2C1);\n" "+\n" @@ -331,7 +330,7 @@ "+/* this assert fires every time, contrary to IOP manual\t\n" "+\tPASSERT( (status&IOP321_ISR_UNITBUSY)!=0 );\n" "+*/\n" - "+\tPASSERT( (status&IOP321_ISR_RXREAD)=0 );\n" + "+\tPASSERT( (status&IOP321_ISR_RXREAD)==0 );\n" "+\t \n" "+\treturn rc;\n" "+}\n" @@ -387,8 +386,8 @@ "+\tint ii;\n" "+\tint rc = 0;\n" "+\n" - "+\tfor ( ii = 0; rc = 0 && ii != count; ++ii ){\n" - "+\t\trc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii=count-1);\n" + "+\tfor ( ii = 0; rc == 0 && ii != count; ++ii ){\n" + "+\t\trc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii==count-1);\n" "+\t}\n" "+\treturn rc;\n" "+}\n" @@ -401,8 +400,8 @@ "+\tint ii;\n" "+\tint rc = 0;\n" "+\n" - "+\tfor ( ii = 0; rc = 0 && ii != count; ++ii ){\n" - "+\t\trc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii=count-1);\n" + "+\tfor ( ii = 0; rc == 0 && ii != count; ++ii ){\n" + "+\t\trc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii==count-1);\n" "+\t}\n" "+\treturn rc;\n" "+}\n" @@ -451,7 +450,7 @@ "+\tiop3xx_adap_reset( iop3xx_adap );\n" "+\tiop3xx_adap_enable( iop3xx_adap );\n" "+\n" - "+\tfor ( im = 0; ret = 0 && im != num; ++im ){\n" + "+\tfor ( im = 0; ret == 0 && im != num; ++im ){\n" "+\t\tret = iop3xx_handle_msg( i2c_adap, &msgs[im] );\n" "+\t}\n" "+\n" @@ -642,7 +641,7 @@ "+/*\n" "+ * iop321 hardware bit definitions\n" "+ */\n" - "+#define IOP321_ICR_FAST_MODE 0x8000 /* 1@0kBps, 0\0200kBps */\n" + "+#define IOP321_ICR_FAST_MODE 0x8000 /* 1=400kBps, 0=100kBps */\n" "+#define IOP321_ICR_UNIT_RESET 0x4000 /* 1=RESET */\n" "+#define IOP321_ICR_SADIE 0x2000 /* 1=Slave Detect Interrupt Enable */\n" "+#define IOP321_ICR_ALDIE 0x1000 /* 1=Arb Loss Detect Interrupt Enable */\n" @@ -736,4 +735,4 @@ "+\n" +#endif /* I2C_IOP3XX_H */ -760b21866a0540503c787e0a426fcf62a0ced215f4040b88659083acb0accbe3 +c53c30905af11712b0e47a83db658234251ea3598149582ccc9d70c59210d5e3
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.