diff for duplicates of <10642734271040@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 5847fc7..cdab18f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -158,7 +158,7 @@ diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman. + +static int bit_velle_getscl(void *data) +{ -+ return ( 0 = ( (inb(CTRL)) & I2C_SCLIN ) ); ++ return ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) ); +} + +static int bit_velle_getsda(void *data) @@ -168,7 +168,7 @@ diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman. + +static int bit_velle_init(void) +{ -+ if (!request_region(base, (base = 0x3bc) ? 3 : 8, ++ if (!request_region(base, (base == 0x3bc) ? 3 : 8, + "i2c (Vellemann adapter)")) + return -ENODEV; + @@ -201,11 +201,11 @@ diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman. +static int __init i2c_bitvelle_init(void) +{ + printk(KERN_INFO "i2c-velleman.o: i2c Velleman K8000 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_velle_data.data=(void*)DEFAULT_BASE; -+ if (bit_velle_init()=0) { ++ if (bit_velle_init()==0) { + if(i2c_bit_add_bus(&bit_velle_ops) < 0) + return -ENODEV; + } else { @@ -213,7 +213,7 @@ diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman. + } + } else { + bit_velle_data.data=(void*)base; -+ if (bit_velle_init()=0) { ++ if (bit_velle_init()==0) { + if(i2c_bit_add_bus(&bit_velle_ops) < 0) + return -ENODEV; + } else { @@ -227,7 +227,7 @@ diff -Nru a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman. +static void __exit i2c_bitvelle_exit(void) +{ + i2c_bit_del_bus(&bit_velle_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>"); @@ -322,7 +322,7 @@ diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c - -static int bit_velle_getscl(void *data) -{ -- return ( 0 = ( (inb(CTRL)) & I2C_SCLIN ) ); +- return ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) ); -} - -static int bit_velle_getsda(void *data) @@ -332,7 +332,7 @@ diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c - -static int bit_velle_init(void) -{ -- if (!request_region(base, (base = 0x3bc) ? 3 : 8, +- if (!request_region(base, (base == 0x3bc) ? 3 : 8, - "i2c (Vellemann adapter)")) - return -ENODEV; - @@ -366,11 +366,11 @@ diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c -static int __init i2c_bitvelle_init(void) -{ - printk(KERN_INFO "i2c-velleman.o: i2c Velleman K8000 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_velle_data.data=(void*)DEFAULT_BASE; -- if (bit_velle_init()=0) { +- if (bit_velle_init()==0) { - if(i2c_bit_add_bus(&bit_velle_ops) < 0) - return -ENODEV; - } else { @@ -378,7 +378,7 @@ diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c - } - } else { - bit_velle_data.data=(void*)base; -- if (bit_velle_init()=0) { +- if (bit_velle_init()==0) { - if(i2c_bit_add_bus(&bit_velle_ops) < 0) - return -ENODEV; - } else { @@ -392,7 +392,7 @@ diff -Nru a/drivers/i2c/i2c-velleman.c b/drivers/i2c/i2c-velleman.c -static void __exit i2c_bitvelle_exit(void) -{ - i2c_bit_del_bus(&bit_velle_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 fac1538..8a2ad4c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734262308@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:27 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -167,7 +166,7 @@ "+\n" "+static int bit_velle_getscl(void *data)\n" "+{\n" - "+\treturn ( 0 = ( (inb(CTRL)) & I2C_SCLIN ) );\n" + "+\treturn ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) );\n" "+}\n" "+\n" "+static int bit_velle_getsda(void *data)\n" @@ -177,7 +176,7 @@ "+\n" "+static int bit_velle_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\"i2c (Vellemann adapter)\"))\n" "+\t\treturn -ENODEV;\n" "+\n" @@ -210,11 +209,11 @@ "+static int __init i2c_bitvelle_init(void)\n" "+{\n" "+\tprintk(KERN_INFO \"i2c-velleman.o: i2c Velleman K8000 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_velle_data.data=(void*)DEFAULT_BASE;\n" - "+\t\tif (bit_velle_init()=0) {\n" + "+\t\tif (bit_velle_init()==0) {\n" "+\t\t\tif(i2c_bit_add_bus(&bit_velle_ops) < 0)\n" "+\t\t\t\treturn -ENODEV;\n" "+\t\t} else {\n" @@ -222,7 +221,7 @@ "+\t\t}\n" "+\t} else {\n" "+\t\tbit_velle_data.data=(void*)base;\n" - "+\t\tif (bit_velle_init()=0) {\n" + "+\t\tif (bit_velle_init()==0) {\n" "+\t\t\tif(i2c_bit_add_bus(&bit_velle_ops) < 0)\n" "+\t\t\t\treturn -ENODEV;\n" "+\t\t} else {\n" @@ -236,7 +235,7 @@ "+static void __exit i2c_bitvelle_exit(void)\n" "+{\t\n" "+\ti2c_bit_del_bus(&bit_velle_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" @@ -331,7 +330,7 @@ "-\n" "-static int bit_velle_getscl(void *data)\n" "-{\n" - "-\treturn ( 0 = ( (inb(CTRL)) & I2C_SCLIN ) );\n" + "-\treturn ( 0 == ( (inb(CTRL)) & I2C_SCLIN ) );\n" "-}\n" "-\n" "-static int bit_velle_getsda(void *data)\n" @@ -341,7 +340,7 @@ "-\n" "-static int bit_velle_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\"i2c (Vellemann adapter)\"))\n" "-\t\treturn -ENODEV;\n" "-\n" @@ -375,11 +374,11 @@ "-static int __init i2c_bitvelle_init(void)\n" "-{\n" "-\tprintk(KERN_INFO \"i2c-velleman.o: i2c Velleman K8000 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_velle_data.data=(void*)DEFAULT_BASE;\n" - "-\t\tif (bit_velle_init()=0) {\n" + "-\t\tif (bit_velle_init()==0) {\n" "-\t\t\tif(i2c_bit_add_bus(&bit_velle_ops) < 0)\n" "-\t\t\t\treturn -ENODEV;\n" "-\t\t} else {\n" @@ -387,7 +386,7 @@ "-\t\t}\n" "-\t} else {\n" "-\t\tbit_velle_data.data=(void*)base;\n" - "-\t\tif (bit_velle_init()=0) {\n" + "-\t\tif (bit_velle_init()==0) {\n" "-\t\t\tif(i2c_bit_add_bus(&bit_velle_ops) < 0)\n" "-\t\t\t\treturn -ENODEV;\n" "-\t\t} else {\n" @@ -401,7 +400,7 @@ "-static void __exit i2c_bitvelle_exit(void)\n" "-{\t\n" "-\ti2c_bit_del_bus(&bit_velle_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" @@ -413,4 +412,4 @@ "-module_init(i2c_bitvelle_init);\n" -module_exit(i2c_bitvelle_exit); -88406067900ebc71fb77bd8055471844d9e26ffeff12762bd1b197cd2d25ccb0 +01fe8a39800e978e22db923c9f463207d03adc57b35d086ddf8348ebc66d95e8
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.