diff for duplicates of <10553638061293@kroah.com> diff --git a/a/1.txt b/N1/1.txt index f3b93e6..ddc5809 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -211,10 +211,10 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/i2c-iop3xx.c + * Concrete compare_funcs */ -static int all_bits_clear( unsigned test, unsigned mask ) { -- return (test&mask) = 0; +- return (test&mask) == 0; +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; @@ -265,8 +265,8 @@ 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 &= ~(iop3xx_adap->channel==0? ++ *IOP321_GPOD &= ~(iop3xx_adap->channel==0 ? IOP321_GPOD_I2C0: IOP321_GPOD_I2C1); @@ -301,12 +301,12 @@ 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 ); + rc = iop3xx_adap_wait_tx_done(iop3xx_adap, &status); + /* 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; } @@ -373,9 +373,9 @@ 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 ){ -+ 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 ){ ++ for (ii = 0; rc == 0 && ii != count; ++ii) { + rc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii==count-1); } return rc; } @@ -390,9 +390,9 @@ 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 ){ -+ 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 ){ ++ for (ii = 0; rc == 0 && ii != count; ++ii) { + rc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii==count-1); } return rc; } @@ -452,9 +452,9 @@ 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] ); -+ for (im = 0; ret = 0 && im != num; ++im) { ++ for (im = 0; ret == 0 && im != num; ++im) { + ret = iop3xx_handle_msg(i2c_adap, &msgs[im]); } @@ -638,7 +638,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 */ @@ -647,7 +647,7 @@ diff -Nru a/drivers/i2c/i2c-iop3xx.h b/drivers/i2c/i2c-iop3xx.h -#define IOP321_ICR_RXFULLIE 0x0200 /* 1=Receive Full Interrupt Enable */ -#define IOP321_ICR_TXEMPTYIE 0x0100 /* 1=Transmit Empty Interrupt Enable */ -#define IOP321_ICR_GCD 0x0080 /* 1=General Call Disable */ -+#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 b4eb3b1..1d34952 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01055363806450@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" @@ -220,10 +219,10 @@ "+ * Concrete compare_funcs \n" " */\n" "-static int all_bits_clear( unsigned test, unsigned mask ) {\n" - "-\treturn (test&mask) = 0;\n" + "-\treturn (test&mask) == 0;\n" "+static int all_bits_clear(unsigned test, unsigned mask)\n" "+{\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" @@ -274,8 +273,8 @@ "+ */\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*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" @@ -310,12 +309,12 @@ "-/* 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" "+\trc = iop3xx_adap_wait_tx_done(iop3xx_adap, &status);\n" "+\t/* this assert fires every time, contrary to IOP manual\t\n" "+\tPASSERT((status&IOP321_ISR_UNITBUSY)!=0);\n" "+\t*/\n" - "+\tPASSERT((status&IOP321_ISR_RXREAD)=0);\n" + "+\tPASSERT((status&IOP321_ISR_RXREAD)==0);\n" " \t \n" " \treturn rc;\n" " }\n" @@ -382,9 +381,9 @@ " \tint ii;\n" " \tint rc = 0;\n" " \n" - "-\tfor ( ii = 0; rc = 0 && ii != count; ++ii ){\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" + "+\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" @@ -399,9 +398,9 @@ " \tint ii;\n" " \tint rc = 0;\n" " \n" - "-\tfor ( ii = 0; rc = 0 && ii != count; ++ii ){\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" + "+\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" @@ -461,9 +460,9 @@ "+\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" - "+\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" @@ -647,7 +646,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" @@ -656,7 +655,7 @@ "-#define IOP321_ICR_RXFULLIE 0x0200 /* 1=Receive Full Interrupt Enable */\n" "-#define IOP321_ICR_TXEMPTYIE 0x0100 /* 1=Transmit Empty Interrupt Enable */\n" "-#define IOP321_ICR_GCD 0x0080 /* 1=General Call Disable */\n" - "+#define IOP321_ICR_FAST_MODE\t0x8000\t/* 1@0kBps, 0\0200kBps */\n" + "+#define IOP321_ICR_FAST_MODE\t0x8000\t/* 1=400kBps, 0=100kBps */\n" "+#define IOP321_ICR_UNIT_RESET\t0x4000\t/* 1=RESET */\n" "+#define IOP321_ICR_SADIE\t0x2000\t/* 1=Slave Detect Interrupt Enable */\n" "+#define IOP321_ICR_ALDIE\t0x1000\t/* 1=Arb Loss Detect Interrupt Enable */\n" @@ -791,4 +790,4 @@ " \n" #endif /* I2C_IOP3XX_H */ -610872e48e0ed73468ab1d63132ad87a49d735fa1858a888b0cf33463afa6b6b +189b71b312ded55392c0c4c9eaca7d3c6790e7b175c62930aebfe0e965871291
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.