diff for duplicates of <1049328958830@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 14aedc3..0a9162f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,7 +76,7 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - end = strlen(name_buffer); - - for (i = 0; i < 32; i++) { -- if (adapter->algo->name[i] = ' ') +- if (adapter->algo->name[i] == ' ') - break; - name_buffer[end++] = tolower(adapter->algo->name[i]); - } @@ -197,8 +197,10 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - curbufsize = 0; - for (i = 0; i < SENSORS_ENTRY_MAX; i++) - if (i2c_entries[i]) { -- client_tbl - i2c_entries[i]->ctl_table->child->child; -- buflen - sprintf(BUF, "%d\t%s\n", client_tbl->ctl_name, +- client_tbl = +- i2c_entries[i]->ctl_table->child->child; +- buflen = +- sprintf(BUF, "%d\t%s\n", client_tbl->ctl_name, - client_tbl->procname); - if (buflen + curbufsize > *lenp) - buflen = *lenp - curbufsize; @@ -227,7 +229,8 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - for (i = 0; (i < SENSORS_ENTRY_MAX) && (nrels < maxels); - i++) - if (i2c_entries[i]) { -- client_tbl - i2c_entries[i]->ctl_table->child-> +- client_tbl = +- i2c_entries[i]->ctl_table->child-> - child; - data.sysctl_id = client_tbl->ctl_name; - strcpy(data.name, client_tbl->procname); @@ -235,7 +238,8 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - sizeof(struct - i2c_chips_data))) - return -EFAULT; -- (char *) oldval +- sizeof(struct i2c_chips_data); +- (char *) oldval += +- sizeof(struct i2c_chips_data); - nrels++; - } - oldlen = nrels * sizeof(struct i2c_chips_data); @@ -405,7 +409,7 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - - /* Check for a minus */ - if (!((ret=get_user(nextchar, (char *) buffer))) -- && (nextchar = '-')) { +- && (nextchar == '-')) { - min = 1; - bufsize--; - ((char *) buffer)++; @@ -430,7 +434,7 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - mag++; - } - -- if (bufsize && (nextchar = '.')) { +- if (bufsize && (nextchar == '.')) { - /* Skip the dot */ - bufsize--; - ((char *) buffer)++; @@ -515,7 +519,8 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c - buflen = 0; - strcpy(printfstr, "%ld.%0Xld"); - printfstr[6] = magnitude + '0'; -- buflen +- sprintf(BUF + buflen, printfstr, +- buflen += +- sprintf(BUF + buflen, printfstr, - abs(results[nr]) / times, - abs(results[nr]) % times); - if (buflen < 0) { /* Oops, a sprintf error! */ @@ -552,7 +557,8 @@ diff -Nru a/drivers/i2c/i2c-proc.c b/drivers/i2c/i2c-proc.c { - printk(KERN_INFO "i2c-proc.o version %s (%s)\n", I2C_VERSION, I2C_DATE); - if (! -- (i2c_proc_header - register_sysctl_table(i2c_proc, 0))) { +- (i2c_proc_header = +- register_sysctl_table(i2c_proc, 0))) { - printk(KERN_ERR "i2c-proc.o: error: sysctl interface not supported by kernel!\n"); - return -EPERM; - } diff --git a/a/content_digest b/N1/content_digest index 44b7b27..8c38f01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010493289582408@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.66\0" - "Date\0Thu, 19 May 2005 06:23:52 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] More i2c driver changes for 2.5.66\0" + "Date\0Wed, 2 Apr 2003 16:15:58 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -85,7 +84,7 @@ "-\t\tend = strlen(name_buffer);\n" "-\n" "-\t\tfor (i = 0; i < 32; i++) {\n" - "-\t\t\tif (adapter->algo->name[i] = ' ')\n" + "-\t\t\tif (adapter->algo->name[i] == ' ')\n" "-\t\t\t\tbreak;\n" "-\t\t\tname_buffer[end++] = tolower(adapter->algo->name[i]);\n" "-\t\t}\n" @@ -206,8 +205,10 @@ "-\tcurbufsize = 0;\n" "-\tfor (i = 0; i < SENSORS_ENTRY_MAX; i++)\n" "-\t\tif (i2c_entries[i]) {\n" - "-\t\t\tclient_tbl -\t\t\t i2c_entries[i]->ctl_table->child->child;\n" - "-\t\t\tbuflen -\t\t\t sprintf(BUF, \"%d\\t%s\\n\", client_tbl->ctl_name,\n" + "-\t\t\tclient_tbl =\n" + "-\t\t\t i2c_entries[i]->ctl_table->child->child;\n" + "-\t\t\tbuflen =\n" + "-\t\t\t sprintf(BUF, \"%d\\t%s\\n\", client_tbl->ctl_name,\n" "-\t\t\t\t client_tbl->procname);\n" "-\t\t\tif (buflen + curbufsize > *lenp)\n" "-\t\t\t\tbuflen = *lenp - curbufsize;\n" @@ -236,7 +237,8 @@ "-\t\tfor (i = 0; (i < SENSORS_ENTRY_MAX) && (nrels < maxels);\n" "-\t\t i++)\n" "-\t\t\tif (i2c_entries[i]) {\n" - "-\t\t\t\tclient_tbl -\t\t\t\t i2c_entries[i]->ctl_table->child->\n" + "-\t\t\t\tclient_tbl =\n" + "-\t\t\t\t i2c_entries[i]->ctl_table->child->\n" "-\t\t\t\t child;\n" "-\t\t\t\tdata.sysctl_id = client_tbl->ctl_name;\n" "-\t\t\t\tstrcpy(data.name, client_tbl->procname);\n" @@ -244,7 +246,8 @@ "-\t\t\t\t\t sizeof(struct\n" "-\t\t\t\t\t\t i2c_chips_data)))\n" "-\t\t\t\t\treturn -EFAULT;\n" - "-\t\t\t\t(char *) oldval +-\t\t\t\t sizeof(struct i2c_chips_data);\n" + "-\t\t\t\t(char *) oldval +=\n" + "-\t\t\t\t sizeof(struct i2c_chips_data);\n" "-\t\t\t\tnrels++;\n" "-\t\t\t}\n" "-\t\toldlen = nrels * sizeof(struct i2c_chips_data);\n" @@ -414,7 +417,7 @@ "-\n" "-\t\t/* Check for a minus */\n" "-\t\tif (!((ret=get_user(nextchar, (char *) buffer)))\n" - "-\t\t && (nextchar = '-')) {\n" + "-\t\t && (nextchar == '-')) {\n" "-\t\t\tmin = 1;\n" "-\t\t\tbufsize--;\n" "-\t\t\t((char *) buffer)++;\n" @@ -439,7 +442,7 @@ "-\t\t\tmag++;\n" "-\t\t}\n" "-\n" - "-\t\tif (bufsize && (nextchar = '.')) {\n" + "-\t\tif (bufsize && (nextchar == '.')) {\n" "-\t\t\t/* Skip the dot */\n" "-\t\t\tbufsize--;\n" "-\t\t\t((char *) buffer)++;\n" @@ -524,7 +527,8 @@ "-\t\t\t\tbuflen = 0;\n" "-\t\t\tstrcpy(printfstr, \"%ld.%0Xld\");\n" "-\t\t\tprintfstr[6] = magnitude + '0';\n" - "-\t\t\tbuflen +-\t\t\t sprintf(BUF + buflen, printfstr,\n" + "-\t\t\tbuflen +=\n" + "-\t\t\t sprintf(BUF + buflen, printfstr,\n" "-\t\t\t\t abs(results[nr]) / times,\n" "-\t\t\t\t abs(results[nr]) % times);\n" "-\t\t\tif (buflen < 0) {\t/* Oops, a sprintf error! */\n" @@ -561,7 +565,8 @@ " {\n" "-\tprintk(KERN_INFO \"i2c-proc.o version %s (%s)\\n\", I2C_VERSION, I2C_DATE);\n" "-\tif (!\n" - "-\t (i2c_proc_header -\t register_sysctl_table(i2c_proc, 0))) {\n" + "-\t (i2c_proc_header =\n" + "-\t register_sysctl_table(i2c_proc, 0))) {\n" "-\t\tprintk(KERN_ERR \"i2c-proc.o: error: sysctl interface not supported by kernel!\\n\");\n" "-\t\treturn -EPERM;\n" "-\t}\n" @@ -632,4 +637,4 @@ " Force variables overrule all other variables; they force a detection on\n" that place. If a specific chip is given, the module blindly assumes this -636ee084f56d734c689f21c8d13f11c9660259da03ff283faa54887ceb6cf840 +0af6b5c30128e49f6b19cbcbbf37f4a87770da1748387a1ef62898032c26d867
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.