diff for duplicates of <10642734262038@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 876914c..ca05255 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -98,7 +98,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.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-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */ @@ -156,17 +156,17 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c + +static int bit_elv_getscl(void *data) +{ -+ return ( 0 = ( (inb_p(STAT)) & 0x08 ) ); ++ return ( 0 == ( (inb_p(STAT)) & 0x08 ) ); +} + +static int bit_elv_getsda(void *data) +{ -+ return ( 0 = ( (inb_p(STAT)) & 0x40 ) ); ++ return ( 0 == ( (inb_p(STAT)) & 0x40 ) ); +} + +static int bit_elv_init(void) +{ -+ if (!request_region(base, (base = 0x3bc) ? 3 : 8, ++ if (!request_region(base, (base == 0x3bc) ? 3 : 8, + "i2c (ELV adapter)")) + return -ENODEV; + @@ -189,7 +189,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c + return 0; + +fail: -+ release_region(base , (base = 0x3bc) ? 3 : 8); ++ release_region(base , (base == 0x3bc) ? 3 : 8); + return -ENODEV; +} + @@ -217,11 +217,11 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c +static int __init i2c_bitelv_init(void) +{ + printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); -+ if (base=0) { ++ if (base==0) { + /* probe some values */ -+ basefiFAULT_BASE; ++ base=DEFAULT_BASE; + bit_elv_data.data=(void*)DEFAULT_BASE; -+ if (bit_elv_init()=0) { ++ if (bit_elv_init()==0) { + if(i2c_bit_add_bus(&bit_elv_ops) < 0) + return -ENODEV; + } else { @@ -229,7 +229,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c + } + } else { + i2c_set_adapdata(&bit_elv_ops, (void *)base); -+ if (bit_elv_init()=0) { ++ if (bit_elv_init()==0) { + if(i2c_bit_add_bus(&bit_elv_ops) < 0) + return -ENODEV; + } else { @@ -243,7 +243,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c +static void __exit i2c_bitelv_exit(void) +{ + i2c_bit_del_bus(&bit_elv_ops); -+ release_region(base , (base = 0x3bc) ? 3 : 8); ++ release_region(base , (base == 0x3bc) ? 3 : 8); +} + +MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>"); @@ -278,7 +278,7 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.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-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */ @@ -336,17 +336,17 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c - -static int bit_elv_getscl(void *data) -{ -- return ( 0 = ( (inb_p(STAT)) & 0x08 ) ); +- return ( 0 == ( (inb_p(STAT)) & 0x08 ) ); -} - -static int bit_elv_getsda(void *data) -{ -- return ( 0 = ( (inb_p(STAT)) & 0x40 ) ); +- return ( 0 == ( (inb_p(STAT)) & 0x40 ) ); -} - -static int bit_elv_init(void) -{ -- if (!request_region(base, (base = 0x3bc) ? 3 : 8, +- if (!request_region(base, (base == 0x3bc) ? 3 : 8, - "i2c (ELV adapter)")) - return -ENODEV; - @@ -369,7 +369,7 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c - return 0; - -fail: -- release_region(base , (base = 0x3bc) ? 3 : 8); +- release_region(base , (base == 0x3bc) ? 3 : 8); - return -ENODEV; -} - @@ -397,11 +397,11 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c -static int __init i2c_bitelv_init(void) -{ - printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); -- if (base=0) { +- if (base==0) { - /* probe some values */ -- basefiFAULT_BASE; +- base=DEFAULT_BASE; - bit_elv_data.data=(void*)DEFAULT_BASE; -- if (bit_elv_init()=0) { +- if (bit_elv_init()==0) { - if(i2c_bit_add_bus(&bit_elv_ops) < 0) - return -ENODEV; - } else { @@ -409,7 +409,7 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c - } - } else { - i2c_set_adapdata(&bit_elv_ops, (void *)base); -- if (bit_elv_init()=0) { +- if (bit_elv_init()==0) { - if(i2c_bit_add_bus(&bit_elv_ops) < 0) - return -ENODEV; - } else { @@ -423,7 +423,7 @@ diff -Nru a/drivers/i2c/i2c-elv.c b/drivers/i2c/i2c-elv.c -static void __exit i2c_bitelv_exit(void) -{ - i2c_bit_del_bus(&bit_elv_ops); -- release_region(base , (base = 0x3bc) ? 3 : 8); +- release_region(base , (base == 0x3bc) ? 3 : 8); -} - -MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>"); diff --git a/a/content_digest b/N1/content_digest index 5115b5c..ebc14c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734251033@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:26 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -107,7 +106,7 @@ "+ 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-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */\n" @@ -165,17 +164,17 @@ "+\n" "+static int bit_elv_getscl(void *data)\n" "+{\n" - "+\treturn ( 0 = ( (inb_p(STAT)) & 0x08 ) );\n" + "+\treturn ( 0 == ( (inb_p(STAT)) & 0x08 ) );\n" "+}\n" "+\n" "+static int bit_elv_getsda(void *data)\n" "+{\n" - "+\treturn ( 0 = ( (inb_p(STAT)) & 0x40 ) );\n" + "+\treturn ( 0 == ( (inb_p(STAT)) & 0x40 ) );\n" "+}\n" "+\n" "+static int bit_elv_init(void)\n" "+{\n" - "+\tif (!request_region(base, (base = 0x3bc) ? 3 : 8,\n" + "+\tif (!request_region(base, (base == 0x3bc) ? 3 : 8,\n" "+\t\t\t\t\"i2c (ELV adapter)\"))\n" "+\t\treturn -ENODEV;\n" "+\n" @@ -198,7 +197,7 @@ "+\treturn 0;\n" "+\n" "+fail:\n" - "+\trelease_region(base , (base = 0x3bc) ? 3 : 8);\n" + "+\trelease_region(base , (base == 0x3bc) ? 3 : 8);\n" "+\treturn -ENODEV;\n" "+}\n" "+\n" @@ -226,11 +225,11 @@ "+static int __init i2c_bitelv_init(void)\n" "+{\n" "+\tprintk(KERN_INFO \"i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\\n\", I2C_VERSION, I2C_DATE);\n" - "+\tif (base=0) {\n" + "+\tif (base==0) {\n" "+\t\t/* probe some values */\n" - "+\t\tbase\357\254\201FAULT_BASE;\n" + "+\t\tbase=DEFAULT_BASE;\n" "+\t\tbit_elv_data.data=(void*)DEFAULT_BASE;\n" - "+\t\tif (bit_elv_init()=0) {\n" + "+\t\tif (bit_elv_init()==0) {\n" "+\t\t\tif(i2c_bit_add_bus(&bit_elv_ops) < 0)\n" "+\t\t\t\treturn -ENODEV;\n" "+\t\t} else {\n" @@ -238,7 +237,7 @@ "+\t\t}\n" "+\t} else {\n" "+\t\ti2c_set_adapdata(&bit_elv_ops, (void *)base);\n" - "+\t\tif (bit_elv_init()=0) {\n" + "+\t\tif (bit_elv_init()==0) {\n" "+\t\t\tif(i2c_bit_add_bus(&bit_elv_ops) < 0)\n" "+\t\t\t\treturn -ENODEV;\n" "+\t\t} else {\n" @@ -252,7 +251,7 @@ "+static void __exit i2c_bitelv_exit(void)\n" "+{\n" "+\ti2c_bit_del_bus(&bit_elv_ops);\n" - "+\trelease_region(base , (base = 0x3bc) ? 3 : 8);\n" + "+\trelease_region(base , (base == 0x3bc) ? 3 : 8);\n" "+}\n" "+\n" "+MODULE_AUTHOR(\"Simon G. Vogl <simon@tk.uni-linz.ac.at>\");\n" @@ -287,7 +286,7 @@ "- 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-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */\n" @@ -345,17 +344,17 @@ "-\n" "-static int bit_elv_getscl(void *data)\n" "-{\n" - "-\treturn ( 0 = ( (inb_p(STAT)) & 0x08 ) );\n" + "-\treturn ( 0 == ( (inb_p(STAT)) & 0x08 ) );\n" "-}\n" "-\n" "-static int bit_elv_getsda(void *data)\n" "-{\n" - "-\treturn ( 0 = ( (inb_p(STAT)) & 0x40 ) );\n" + "-\treturn ( 0 == ( (inb_p(STAT)) & 0x40 ) );\n" "-}\n" "-\n" "-static int bit_elv_init(void)\n" "-{\n" - "-\tif (!request_region(base, (base = 0x3bc) ? 3 : 8,\n" + "-\tif (!request_region(base, (base == 0x3bc) ? 3 : 8,\n" "-\t\t\t\t\"i2c (ELV adapter)\"))\n" "-\t\treturn -ENODEV;\n" "-\n" @@ -378,7 +377,7 @@ "-\treturn 0;\n" "-\n" "-fail:\n" - "-\trelease_region(base , (base = 0x3bc) ? 3 : 8);\n" + "-\trelease_region(base , (base == 0x3bc) ? 3 : 8);\n" "-\treturn -ENODEV;\n" "-}\n" "-\n" @@ -406,11 +405,11 @@ "-static int __init i2c_bitelv_init(void)\n" "-{\n" "-\tprintk(KERN_INFO \"i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\\n\", I2C_VERSION, I2C_DATE);\n" - "-\tif (base=0) {\n" + "-\tif (base==0) {\n" "-\t\t/* probe some values */\n" - "-\t\tbase\357\254\201FAULT_BASE;\n" + "-\t\tbase=DEFAULT_BASE;\n" "-\t\tbit_elv_data.data=(void*)DEFAULT_BASE;\n" - "-\t\tif (bit_elv_init()=0) {\n" + "-\t\tif (bit_elv_init()==0) {\n" "-\t\t\tif(i2c_bit_add_bus(&bit_elv_ops) < 0)\n" "-\t\t\t\treturn -ENODEV;\n" "-\t\t} else {\n" @@ -418,7 +417,7 @@ "-\t\t}\n" "-\t} else {\n" "-\t\ti2c_set_adapdata(&bit_elv_ops, (void *)base);\n" - "-\t\tif (bit_elv_init()=0) {\n" + "-\t\tif (bit_elv_init()==0) {\n" "-\t\t\tif(i2c_bit_add_bus(&bit_elv_ops) < 0)\n" "-\t\t\t\treturn -ENODEV;\n" "-\t\t} else {\n" @@ -432,7 +431,7 @@ "-static void __exit i2c_bitelv_exit(void)\n" "-{\n" "-\ti2c_bit_del_bus(&bit_elv_ops);\n" - "-\trelease_region(base , (base = 0x3bc) ? 3 : 8);\n" + "-\trelease_region(base , (base == 0x3bc) ? 3 : 8);\n" "-}\n" "-\n" "-MODULE_AUTHOR(\"Simon G. Vogl <simon@tk.uni-linz.ac.at>\");\n" @@ -444,4 +443,4 @@ "-module_init(i2c_bitelv_init);\n" -module_exit(i2c_bitelv_exit); -4d078fe34991cd211c07d1880394275b799e8b565beb19407328cd5617be1e24 +efaf299e7e143cca9c06a3fa95307ef21d9ff3f779739fd3a8999278f9afa9c1
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.