diff for duplicates of <1105162774201@kroah.com> diff --git a/a/1.txt b/N1/1.txt index f6abae2..587d277 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,7 +113,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/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> - - ---------------------------------------------------------------------------*/ @@ -127,7 +127,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/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> + * + * Major cleanup by Deepak Saxena <dsaxena@plexity.net>, 01/2005: @@ -226,7 +226,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c +#define IOP321_GPOD_I2C0 0x00c0 /* clear these bits to enable ch0 */ +#define IOP321_GPOD_I2C1 0x0030 /* clear these bits to enable ch1 */ + -+ *IOP321_GPOD &= (iop3xx_adap->id = 0) ? ~IOP321_GPOD_I2C0 : ++ *IOP321_GPOD &= (iop3xx_adap->id == 0) ? ~IOP321_GPOD_I2C0 : + ~IOP321_GPOD_I2C1; +#endif /* NB SR bits not same position as CR IE bits :-( */ @@ -370,7 +370,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c +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) + @@ -418,7 +418,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c +static int +iop3xx_i2c_wait_idle(struct i2c_algo_iop3xx_data *iop3xx_adap, int *status) { -- *IOP321_GPOD &= ~(iop3xx_adap->channel=0 ? +- *IOP321_GPOD &= ~(iop3xx_adap->channel==0 ? - IOP321_GPOD_I2C0: - IOP321_GPOD_I2C1); - @@ -458,7 +458,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/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; } @@ -536,11 +536,11 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/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); - } -+ for (ii = 0; rc = 0 && ii != count; ++ii) -+ rc = iop3xx_i2c_write_byte(iop3xx_adap, buf[ii], ii=count-1); ++ for (ii = 0; rc == 0 && ii != count; ++ii) ++ rc = iop3xx_i2c_write_byte(iop3xx_adap, buf[ii], ii==count-1); return rc; } @@ -553,11 +553,11 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/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); - } -+ for (ii = 0; rc = 0 && ii != count; ++ii) -+ rc = iop3xx_i2c_read_byte(iop3xx_adap, &buf[ii], ii=count-1); ++ for (ii = 0; rc == 0 && ii != count; ++ii) ++ rc = iop3xx_i2c_read_byte(iop3xx_adap, &buf[ii], ii==count-1); + return rc; } @@ -599,7 +599,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c + iop3xx_i2c_reset(iop3xx_adap); + iop3xx_i2c_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]); + ret = iop3xx_i2c_handle_msg(i2c_adap, &msgs[im]); } @@ -876,7 +876,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/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 */ @@ -885,7 +885,7 @@ diff -Nru a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/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 IOP3XX_ICR_FAST_MODE 0x8000 /* 1@0kBps, 0\x100kBps */ ++#define IOP3XX_ICR_FAST_MODE 0x8000 /* 1=400kBps, 0=100kBps */ +#define IOP3XX_ICR_UNIT_RESET 0x4000 /* 1=RESET */ +#define IOP3XX_ICR_SAD_IE 0x2000 /* 1=Slave Detect Interrupt Enable */ +#define IOP3XX_ICR_ALD_IE 0x1000 /* 1=Arb Loss Detect Interrupt Enable */ diff --git a/a/content_digest b/N1/content_digest index 7d686fa..5cf51d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011051627742463@kroah.com\0" - "ref\011051627731563@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C patches for 2.6.10\0" - "Date\0Thu, 19 May 2005 06:25:30 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C patches for 2.6.10\0" + "Date\0Fri, 7 Jan 2005 21:39:34 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -122,7 +121,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" @@ -136,7 +135,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" "+ * Major cleanup by Deepak Saxena <dsaxena@plexity.net>, 01/2005:\n" @@ -235,7 +234,7 @@ "+#define IOP321_GPOD_I2C0 0x00c0 /* clear these bits to enable ch0 */\n" "+#define IOP321_GPOD_I2C1 0x0030 /* clear these bits to enable ch1 */\n" "+\n" - "+\t*IOP321_GPOD &= (iop3xx_adap->id = 0) ? ~IOP321_GPOD_I2C0 : \n" + "+\t*IOP321_GPOD &= (iop3xx_adap->id == 0) ? ~IOP321_GPOD_I2C0 : \n" "+\t\t~IOP321_GPOD_I2C1;\n" "+#endif\n" " \t/* NB SR bits not same position as CR IE bits :-( */\n" @@ -379,7 +378,7 @@ "+static int \n" "+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" "+\n" @@ -427,7 +426,7 @@ "+static int \n" "+iop3xx_i2c_wait_idle(struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)\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" @@ -467,7 +466,7 @@ "-\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" @@ -545,11 +544,11 @@ " \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" - "+\tfor (ii = 0; rc = 0 && ii != count; ++ii) \n" - "+\t\trc = iop3xx_i2c_write_byte(iop3xx_adap, buf[ii], ii=count-1);\n" + "+\tfor (ii = 0; rc == 0 && ii != count; ++ii) \n" + "+\t\trc = iop3xx_i2c_write_byte(iop3xx_adap, buf[ii], ii==count-1);\n" " \treturn rc;\n" " }\n" " \n" @@ -562,11 +561,11 @@ " \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" - "+\tfor (ii = 0; rc = 0 && ii != count; ++ii)\n" - "+\t\trc = iop3xx_i2c_read_byte(iop3xx_adap, &buf[ii], ii=count-1);\n" + "+\tfor (ii = 0; rc == 0 && ii != count; ++ii)\n" + "+\t\trc = iop3xx_i2c_read_byte(iop3xx_adap, &buf[ii], ii==count-1);\n" "+\t\n" " \treturn rc;\n" " }\n" @@ -608,7 +607,7 @@ "+\tiop3xx_i2c_reset(iop3xx_adap);\n" "+\tiop3xx_i2c_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\tret = iop3xx_i2c_handle_msg(i2c_adap, &msgs[im]);\n" " \t}\n" @@ -885,7 +884,7 @@ " /*\n" " * iop321 hardware bit definitions\n" " */\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" @@ -894,7 +893,7 @@ "-#define IOP321_ICR_RXFULLIE\t0x0200\t/* 1=Receive Full Interrupt Enable */\n" "-#define IOP321_ICR_TXEMPTYIE\t0x0100\t/* 1=Transmit Empty Interrupt Enable */\n" "-#define IOP321_ICR_GCD\t\t0x0080\t/* 1=General Call Disable */\n" - "+#define IOP3XX_ICR_FAST_MODE\t0x8000\t/* 1@0kBps, 0\0200kBps */\n" + "+#define IOP3XX_ICR_FAST_MODE\t0x8000\t/* 1=400kBps, 0=100kBps */\n" "+#define IOP3XX_ICR_UNIT_RESET\t0x4000\t/* 1=RESET */\n" "+#define IOP3XX_ICR_SAD_IE\t0x2000\t/* 1=Slave Detect Interrupt Enable */\n" "+#define IOP3XX_ICR_ALD_IE\t0x1000\t/* 1=Arb Loss Detect Interrupt Enable */\n" @@ -1046,4 +1045,4 @@ " /* --- SMBus only adapters\t\t\t\t\t\t*/\n" " #define I2C_HW_SMBUS_PIIX4\t0x00" -3469d4eb4c24fae68de7f0a1b608eae16b376e3a9c3b2690bcfcad60a0124194 +3d43261971723dbb6f59708d9e72fa92d16f1bb7dc4e9c2cf746fa5336bf1c96
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.