diff for duplicates of <10499274993729@kroah.com> diff --git a/a/1.txt b/N1/1.txt index f22731e..e110486 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -469,9 +469,13 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c + for (i = 0; i <= 2; i++) { + data->temp[i] = via686a_read_value(client, VIA686A_REG_TEMP(i)) << 2; -- data->temp_over[i - 1] + data->temp_over[i] via686a_read_value(client, +- data->temp_over[i - 1] = ++ data->temp_over[i] = + via686a_read_value(client, VIA686A_REG_TEMP_OVER(i)); -- data->temp_hyst[i - 1] + data->temp_hyst[i] via686a_read_value(client, +- data->temp_hyst[i - 1] = ++ data->temp_hyst[i] = + via686a_read_value(client, VIA686A_REG_TEMP_HYST(i)); } @@ -709,164 +914,12 @@ @@ -483,11 +487,11 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - sysctl files. Which function is used is defined in the ctl_table in - the extra1 field. - Each function must return the magnitude (power of 10 to divide the date -- with) if it is called with operation=SENSORS_PROC_REAL_INFO. It must +- with) if it is called with operation==SENSORS_PROC_REAL_INFO. It must - put a maximum of *nrels elements in results reflecting the data of this -- file, and set *nrels to the number it actually put in it, if operation= +- file, and set *nrels to the number it actually put in it, if operation== - SENSORS_PROC_REAL_READ. Finally, it must get upto *nrels elements from -- results and write them to the chip, if operations=SENSORS_PROC_REAL_WRITE. +- results and write them to the chip, if operations==SENSORS_PROC_REAL_WRITE. - Note that on SENSORS_PROC_REAL_READ, I do not check whether results is - large enough (by checking the incoming value of *nrels). This is not very - good practice, but as long as you put less than about 5 values in results, @@ -501,15 +505,15 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_IN0; - -- if (operation = SENSORS_PROC_REAL_INFO) +- if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 2; -- else if (operation = SENSORS_PROC_REAL_READ) { +- else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = IN_FROM_REG(data->in_min[nr], nr); - results[1] = IN_FROM_REG(data->in_max[nr], nr); - results[2] = IN_FROM_REG(data->in[nr], nr); - *nrels_mag = 3; -- } else if (operation = SENSORS_PROC_REAL_WRITE) { +- } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->in_min[nr] = IN_TO_REG(results[0], nr); - via686a_write_value(client, VIA686A_REG_IN_MIN(nr), @@ -530,9 +534,9 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_FAN1 + 1; - -- if (operation = SENSORS_PROC_REAL_INFO) +- if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; -- else if (operation = SENSORS_PROC_REAL_READ) { +- else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = FAN_FROM_REG(data->fan_min[nr - 1], - DIV_FROM_REG(data->fan_div @@ -540,7 +544,7 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - results[1] = FAN_FROM_REG(data->fan[nr - 1], - DIV_FROM_REG(data->fan_div[nr - 1])); - *nrels_mag = 2; -- } else if (operation = SENSORS_PROC_REAL_WRITE) { +- } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->fan_min[nr - 1] = FAN_TO_REG(results[0], - DIV_FROM_REG(data-> @@ -559,15 +563,15 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - struct via686a_data *data = i2c_get_clientdata(client); - int nr = ctl_name - VIA686A_SYSCTL_TEMP; - -- if (operation = SENSORS_PROC_REAL_INFO) +- if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 1; -- else if (operation = SENSORS_PROC_REAL_READ) { +- else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = TEMP_FROM_REG(data->temp_over[nr]); - results[1] = TEMP_FROM_REG(data->temp_hyst[nr]); - results[2] = TEMP_FROM_REG10(data->temp[nr]); - *nrels_mag = 3; -- } else if (operation = SENSORS_PROC_REAL_WRITE) { +- } else if (operation == SENSORS_PROC_REAL_WRITE) { - if (*nrels_mag >= 1) { - data->temp_over[nr] = TEMP_TO_REG(results[0]); - via686a_write_value(client, @@ -588,9 +592,9 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - int *nrels_mag, long *results) -{ - struct via686a_data *data = i2c_get_clientdata(client); -- if (operation = SENSORS_PROC_REAL_INFO) +- if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; -- else if (operation = SENSORS_PROC_REAL_READ) { +- else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = ALARMS_FROM_REG(data->alarms); - *nrels_mag = 1; @@ -604,14 +608,14 @@ diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c - struct via686a_data *data = i2c_get_clientdata(client); - int old; - -- if (operation = SENSORS_PROC_REAL_INFO) +- if (operation == SENSORS_PROC_REAL_INFO) - *nrels_mag = 0; -- else if (operation = SENSORS_PROC_REAL_READ) { +- else if (operation == SENSORS_PROC_REAL_READ) { - via686a_update_client(client); - results[0] = DIV_FROM_REG(data->fan_div[0]); - results[1] = DIV_FROM_REG(data->fan_div[1]); - *nrels_mag = 2; -- } else if (operation = SENSORS_PROC_REAL_WRITE) { +- } else if (operation == SENSORS_PROC_REAL_WRITE) { - old = via686a_read_value(client, VIA686A_REG_FANDIV); - if (*nrels_mag >= 2) { - data->fan_div[1] = DIV_TO_REG(results[1]); diff --git a/a/content_digest b/N1/content_digest index 19b2c04..86b0067 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010499274992901@kroah.com\0" - "ref\010499274993464@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.67\0" - "Date\0Thu, 19 May 2005 06:23:53 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.67\0" + "Date\0Wed, 9 Apr 2003 15:31:39 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -478,9 +477,13 @@ "+\t\tfor (i = 0; i <= 2; i++) {\n" "+\t\t\tdata->temp[i] = via686a_read_value(client,\n" " \t\t\t\t\t\t VIA686A_REG_TEMP(i)) << 2;\n" - "-\t\t\tdata->temp_over[i - 1] +\t\t\tdata->temp_over[i] \t\t\t via686a_read_value(client,\n" + "-\t\t\tdata->temp_over[i - 1] =\n" + "+\t\t\tdata->temp_over[i] =\n" + " \t\t\t via686a_read_value(client,\n" " \t\t\t\t\t VIA686A_REG_TEMP_OVER(i));\n" - "-\t\t\tdata->temp_hyst[i - 1] +\t\t\tdata->temp_hyst[i] \t\t\t via686a_read_value(client,\n" + "-\t\t\tdata->temp_hyst[i - 1] =\n" + "+\t\t\tdata->temp_hyst[i] =\n" + " \t\t\t via686a_read_value(client,\n" " \t\t\t\t\t VIA686A_REG_TEMP_HYST(i));\n" " \t\t}\n" "@@ -709,164 +914,12 @@\n" @@ -492,11 +495,11 @@ "- sysctl files. Which function is used is defined in the ctl_table in\n" "- the extra1 field.\n" "- Each function must return the magnitude (power of 10 to divide the date\n" - "- with) if it is called with operation=SENSORS_PROC_REAL_INFO. It must\n" + "- with) if it is called with operation==SENSORS_PROC_REAL_INFO. It must\n" "- put a maximum of *nrels elements in results reflecting the data of this\n" - "- file, and set *nrels to the number it actually put in it, if operation=\n" + "- file, and set *nrels to the number it actually put in it, if operation==\n" "- SENSORS_PROC_REAL_READ. Finally, it must get upto *nrels elements from\n" - "- results and write them to the chip, if operations=SENSORS_PROC_REAL_WRITE.\n" + "- results and write them to the chip, if operations==SENSORS_PROC_REAL_WRITE.\n" "- Note that on SENSORS_PROC_REAL_READ, I do not check whether results is\n" "- large enough (by checking the incoming value of *nrels). This is not very\n" "- good practice, but as long as you put less than about 5 values in results,\n" @@ -510,15 +513,15 @@ "-\tstruct via686a_data *data = i2c_get_clientdata(client);\n" "-\tint nr = ctl_name - VIA686A_SYSCTL_IN0;\n" "-\n" - "-\tif (operation = SENSORS_PROC_REAL_INFO)\n" + "-\tif (operation == SENSORS_PROC_REAL_INFO)\n" "-\t\t*nrels_mag = 2;\n" - "-\telse if (operation = SENSORS_PROC_REAL_READ) {\n" + "-\telse if (operation == SENSORS_PROC_REAL_READ) {\n" "-\t\tvia686a_update_client(client);\n" "-\t\tresults[0] = IN_FROM_REG(data->in_min[nr], nr);\n" "-\t\tresults[1] = IN_FROM_REG(data->in_max[nr], nr);\n" "-\t\tresults[2] = IN_FROM_REG(data->in[nr], nr);\n" "-\t\t*nrels_mag = 3;\n" - "-\t} else if (operation = SENSORS_PROC_REAL_WRITE) {\n" + "-\t} else if (operation == SENSORS_PROC_REAL_WRITE) {\n" "-\t\tif (*nrels_mag >= 1) {\n" "-\t\t\tdata->in_min[nr] = IN_TO_REG(results[0], nr);\n" "-\t\t\tvia686a_write_value(client, VIA686A_REG_IN_MIN(nr),\n" @@ -539,9 +542,9 @@ "-\tstruct via686a_data *data = i2c_get_clientdata(client);\n" "-\tint nr = ctl_name - VIA686A_SYSCTL_FAN1 + 1;\n" "-\n" - "-\tif (operation = SENSORS_PROC_REAL_INFO)\n" + "-\tif (operation == SENSORS_PROC_REAL_INFO)\n" "-\t\t*nrels_mag = 0;\n" - "-\telse if (operation = SENSORS_PROC_REAL_READ) {\n" + "-\telse if (operation == SENSORS_PROC_REAL_READ) {\n" "-\t\tvia686a_update_client(client);\n" "-\t\tresults[0] = FAN_FROM_REG(data->fan_min[nr - 1],\n" "-\t\t\t\t\t DIV_FROM_REG(data->fan_div\n" @@ -549,7 +552,7 @@ "-\t\tresults[1] = FAN_FROM_REG(data->fan[nr - 1],\n" "-\t\t\t\t DIV_FROM_REG(data->fan_div[nr - 1]));\n" "-\t\t*nrels_mag = 2;\n" - "-\t} else if (operation = SENSORS_PROC_REAL_WRITE) {\n" + "-\t} else if (operation == SENSORS_PROC_REAL_WRITE) {\n" "-\t\tif (*nrels_mag >= 1) {\n" "-\t\t\tdata->fan_min[nr - 1] = FAN_TO_REG(results[0], \n" "-\t\t\t\t\t\t\t DIV_FROM_REG(data->\n" @@ -568,15 +571,15 @@ "-\tstruct via686a_data *data = i2c_get_clientdata(client);\n" "-\tint nr = ctl_name - VIA686A_SYSCTL_TEMP;\n" "-\n" - "-\tif (operation = SENSORS_PROC_REAL_INFO)\n" + "-\tif (operation == SENSORS_PROC_REAL_INFO)\n" "-\t\t*nrels_mag = 1;\n" - "-\telse if (operation = SENSORS_PROC_REAL_READ) {\n" + "-\telse if (operation == SENSORS_PROC_REAL_READ) {\n" "-\t\tvia686a_update_client(client);\n" "-\t\tresults[0] = TEMP_FROM_REG(data->temp_over[nr]);\n" "-\t\tresults[1] = TEMP_FROM_REG(data->temp_hyst[nr]);\n" "-\t\tresults[2] = TEMP_FROM_REG10(data->temp[nr]);\n" "-\t\t*nrels_mag = 3;\n" - "-\t} else if (operation = SENSORS_PROC_REAL_WRITE) {\n" + "-\t} else if (operation == SENSORS_PROC_REAL_WRITE) {\n" "-\t\tif (*nrels_mag >= 1) {\n" "-\t\t\tdata->temp_over[nr] = TEMP_TO_REG(results[0]);\n" "-\t\t\tvia686a_write_value(client,\n" @@ -597,9 +600,9 @@ "-\t\t int *nrels_mag, long *results)\n" "-{\n" "-\tstruct via686a_data *data = i2c_get_clientdata(client);\n" - "-\tif (operation = SENSORS_PROC_REAL_INFO)\n" + "-\tif (operation == SENSORS_PROC_REAL_INFO)\n" "-\t\t*nrels_mag = 0;\n" - "-\telse if (operation = SENSORS_PROC_REAL_READ) {\n" + "-\telse if (operation == SENSORS_PROC_REAL_READ) {\n" "-\t\tvia686a_update_client(client);\n" "-\t\tresults[0] = ALARMS_FROM_REG(data->alarms);\n" "-\t\t*nrels_mag = 1;\n" @@ -613,14 +616,14 @@ "-\tstruct via686a_data *data = i2c_get_clientdata(client);\n" "-\tint old;\n" "-\n" - "-\tif (operation = SENSORS_PROC_REAL_INFO)\n" + "-\tif (operation == SENSORS_PROC_REAL_INFO)\n" "-\t\t*nrels_mag = 0;\n" - "-\telse if (operation = SENSORS_PROC_REAL_READ) {\n" + "-\telse if (operation == SENSORS_PROC_REAL_READ) {\n" "-\t\tvia686a_update_client(client);\n" "-\t\tresults[0] = DIV_FROM_REG(data->fan_div[0]);\n" "-\t\tresults[1] = DIV_FROM_REG(data->fan_div[1]);\n" "-\t\t*nrels_mag = 2;\n" - "-\t} else if (operation = SENSORS_PROC_REAL_WRITE) {\n" + "-\t} else if (operation == SENSORS_PROC_REAL_WRITE) {\n" "-\t\told = via686a_read_value(client, VIA686A_REG_FANDIV);\n" "-\t\tif (*nrels_mag >= 2) {\n" "-\t\t\tdata->fan_div[1] = DIV_TO_REG(results[1]);\n" @@ -649,4 +652,4 @@ " { 0, }\n" }; -d429d066d26082401ce6c71db8f2634ba1a0fa1db9de1f6881bad6f8ed776f78 +a5ca41cbd45e2fa74738edce9d945f5081782b89b9207475f17e0e134d6690bb
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.