diff for duplicates of <20030328062810.GA25399@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 466b0ae..5b8ddd5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -263,31 +263,31 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c - if (kind <= 0) { i = adm1021_read_value(new_client, ADM1021_REG_MAN_ID); - if (i = 0x41) -- if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0x0F0) = 0x030) + if (i == 0x41) +- if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0x0F0) == 0x030) - kind = adm1023; - else - kind = adm1021; -+ if ((adm1021_read_value(new_client, ADM1021_REG_DEV_ID) & 0x0F0) = 0x030) ++ if ((adm1021_read_value(new_client, ADM1021_REG_DEV_ID) & 0x0F0) == 0x030) + kind = adm1023; + else + kind = adm1021; - else if (i = 0x49) + else if (i == 0x49) kind = thmc10; - else if (i = 0x23) + else if (i == 0x23) kind = gl523sm; - else if ((i = 0x4d) && + else if ((i == 0x4d) && - (adm1021_read_value -- (new_client, ADM1021_REG_DEV_ID) = 0x01)) -+ (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) = 0x01)) +- (new_client, ADM1021_REG_DEV_ID) == 0x01)) ++ (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) == 0x01)) kind = max1617a; /* LM84 Mfr ID in a different place */ - else - if (adm1021_read_value -- (new_client, ADM1021_REG_CONV_RATE_R) = 0x00) -+ else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00) +- (new_client, ADM1021_REG_CONV_RATE_R) == 0x00) ++ else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00) kind = lm84; - else if (i = 0x54) + else if (i == 0x54) kind = mc1066; @@ -293,10 +304,8 @@ type_name = "mc1066"; @@ -308,7 +308,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c - /* Register a new directory entry with module sensors */ - err = i2c_register_entry(new_client, type_name, -- (data->type = adm1021) ? +- (data->type == adm1021) ? - adm1021_dir_table_template : - adm1021_max_dir_table_template); - if (err < 0) @@ -320,7 +320,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c + device_create_file(&new_client->dev, &dev_attr_temp_min2); + device_create_file(&new_client->dev, &dev_attr_temp_input2); + device_create_file(&new_client->dev, &dev_attr_alarms); -+ if (data->type = adm1021) ++ if (data->type == adm1021) + device_create_file(&new_client->dev, &dev_attr_die_code); - data->sysctl_id = err; @@ -374,12 +374,18 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c -#endif - - data->temp = adm1021_read_value(client, ADM1021_REG_TEMP); -- data->temp_os - adm1021_read_value(client, ADM1021_REG_TOS_R); -- data->temp_hyst - adm1021_read_value(client, ADM1021_REG_THYST_R); -- data->remote_temp - adm1021_read_value(client, ADM1021_REG_REMOTE_TEMP); -- data->remote_temp_os - adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R); -- data->remote_temp_hyst - adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R); -- data->alarms - adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec; +- data->temp_os = +- adm1021_read_value(client, ADM1021_REG_TOS_R); +- data->temp_hyst = +- adm1021_read_value(client, ADM1021_REG_THYST_R); +- data->remote_temp = +- adm1021_read_value(client, ADM1021_REG_REMOTE_TEMP); +- data->remote_temp_os = +- adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R); +- data->remote_temp_hyst = +- adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R); +- data->alarms = +- adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec; + data->temp_input = adm1021_read_value(client, ADM1021_REG_TEMP); + data->temp_max = adm1021_read_value(client, ADM1021_REG_TOS_R); + data->temp_hyst = adm1021_read_value(client, ADM1021_REG_THYST_R); @@ -387,16 +393,22 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c + data->remote_temp_max = adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R); + data->remote_temp_hyst = adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R); + data->alarms = adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec; - if (data->type = adm1021) -- data->die_code - adm1021_read_value(client, + if (data->type == adm1021) +- data->die_code = +- adm1021_read_value(client, - ADM1021_REG_DIE_CODE); + data->die_code = adm1021_read_value(client, ADM1021_REG_DIE_CODE); - if (data->type = adm1023) { -- data->remote_temp_prec - adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC); -- data->remote_temp_os_prec - adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC); -- data->remote_temp_hyst_prec - adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC); -- data->remote_temp_offset - adm1021_read_value(client, ADM1021_REG_REM_OFFSET); -- data->remote_temp_offset_prec - adm1021_read_value(client, ADM1021_REG_REM_OFFSET_PREC); + if (data->type == adm1023) { +- data->remote_temp_prec = +- adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC); +- data->remote_temp_os_prec = +- adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC); +- data->remote_temp_hyst_prec = +- adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC); +- data->remote_temp_offset = +- adm1021_read_value(client, ADM1021_REG_REM_OFFSET); +- data->remote_temp_offset_prec = +- adm1021_read_value(client, ADM1021_REG_REM_OFFSET_PREC); + data->remote_temp_prec = adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC); + data->remote_temp_os_prec = adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC); + data->remote_temp_hyst_prec = adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC); @@ -417,7 +429,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c { @@ -442,15 +431,15 @@ *nrels_mag = 0; - else if (operation = SENSORS_PROC_REAL_READ) { + else if (operation == SENSORS_PROC_REAL_READ) { adm1021_update_client(client); - results[0] = TEMP_FROM_REG(data->temp_os); + results[0] = TEMP_FROM_REG(data->temp_max); @@ -425,7 +437,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c - results[2] = TEMP_FROM_REG(data->temp); + results[2] = TEMP_FROM_REG(data->temp_input); *nrels_mag = 3; - } else if (operation = SENSORS_PROC_REAL_WRITE) { + } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - data->temp_os = TEMP_TO_REG(results[0]); + data->temp_max = TEMP_TO_REG(results[0]); @@ -445,14 +457,14 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c { @@ -471,68 +461,53 @@ else { *nrels_mag = 0; } - else if (operation = SENSORS_PROC_REAL_READ) { + else if (operation == SENSORS_PROC_REAL_READ) { adm1021_update_client(client); - results[0] = TEMP_FROM_REG(data->remote_temp_os); + results[0] = TEMP_FROM_REG(data->remote_temp_max); results[1] = TEMP_FROM_REG(data->remote_temp_hyst); - results[2] = TEMP_FROM_REG(data->remote_temp); + results[2] = TEMP_FROM_REG(data->remote_temp_input); - if (data->type = adm1023) { + if (data->type == adm1023) { - results[0]=results[0]*1000 + - ((data->remote_temp_os_prec >> 5) * 125); - results[1]=results[1]*1000 + @@ -471,9 +483,9 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c - *nrels_mag = 3; + *nrels_mag = 3; } - } else if (operation = SENSORS_PROC_REAL_WRITE) { + } else if (operation == SENSORS_PROC_REAL_WRITE) { if (*nrels_mag >= 1) { - if (data->type = adm1023) { + if (data->type == adm1023) { - prec=((results[0]-((results[0]/1000)*1000))/125)<<5; - adm1021_write_value(client, - ADM1021_REG_REM_TOS_PREC, @@ -493,7 +505,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c + adm1021_write_value(client, ADM1021_REG_REMOTE_TOS_W, data->remote_temp_max); } if (*nrels_mag >= 2) { - if (data->type = adm1023) { + if (data->type == adm1023) { - prec=((results[1]-((results[1]/1000)*1000))/125)<<5; - adm1021_write_value(client, - ADM1021_REG_REM_THYST_PREC, @@ -512,7 +524,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c + adm1021_write_value(client, ADM1021_REG_REMOTE_THYST_W, data->remote_temp_hyst); } if (*nrels_mag >= 3) { - if (data->type = adm1023) { + if (data->type == adm1023) { - prec=((results[2]-((results[2]/1000)*1000))/125)<<5; - adm1021_write_value(client, - ADM1021_REG_REM_OFFSET_PREC, diff --git a/a/content_digest b/N1/content_digest index 4603ace..d4a4eea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020030326220722.GD26886@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[RFC] adm1021.c converted to sysfs\0" - "Date\0Thu, 19 May 2005 06:23:52 +0000\0" + "Date\0Thu, 27 Mar 2003 22:28:10 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -271,31 +271,31 @@ "-\n" " \tif (kind <= 0) {\n" " \t\ti = adm1021_read_value(new_client, ADM1021_REG_MAN_ID);\n" - " \t\tif (i = 0x41)\n" - "-\t\t if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0x0F0) = 0x030)\n" + " \t\tif (i == 0x41)\n" + "-\t\t if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0x0F0) == 0x030)\n" "-\t\t\tkind = adm1023;\n" "-\t\t else\n" "-\t\t\tkind = adm1021;\n" - "+\t\t\tif ((adm1021_read_value(new_client, ADM1021_REG_DEV_ID) & 0x0F0) = 0x030)\n" + "+\t\t\tif ((adm1021_read_value(new_client, ADM1021_REG_DEV_ID) & 0x0F0) == 0x030)\n" "+\t\t\t\tkind = adm1023;\n" "+\t\t\telse\n" "+\t\t\t\tkind = adm1021;\n" - " \t\telse if (i = 0x49)\n" + " \t\telse if (i == 0x49)\n" " \t\t\tkind = thmc10;\n" - " \t\telse if (i = 0x23)\n" + " \t\telse if (i == 0x23)\n" " \t\t\tkind = gl523sm;\n" - " \t\telse if ((i = 0x4d) &&\n" + " \t\telse if ((i == 0x4d) &&\n" "-\t\t\t (adm1021_read_value\n" - "-\t\t\t (new_client, ADM1021_REG_DEV_ID) = 0x01))\n" - "+\t\t\t (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) = 0x01))\n" + "-\t\t\t (new_client, ADM1021_REG_DEV_ID) == 0x01))\n" + "+\t\t\t (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) == 0x01))\n" " \t\t\tkind = max1617a;\n" " \t\t/* LM84 Mfr ID in a different place */\n" "-\t\telse\n" "-\t\t if (adm1021_read_value\n" - "-\t\t\t(new_client, ADM1021_REG_CONV_RATE_R) = 0x00)\n" - "+\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00)\n" + "-\t\t\t(new_client, ADM1021_REG_CONV_RATE_R) == 0x00)\n" + "+\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00)\n" " \t\t\tkind = lm84;\n" - " \t\telse if (i = 0x54)\n" + " \t\telse if (i == 0x54)\n" " \t\t\tkind = mc1066;\n" "@@ -293,10 +304,8 @@\n" " \t\ttype_name = \"mc1066\";\n" @@ -316,7 +316,7 @@ " \n" "-\t/* Register a new directory entry with module sensors */\n" "-\terr = i2c_register_entry(new_client, type_name,\n" - "-\t\t\t(data->type = adm1021) ?\n" + "-\t\t\t(data->type == adm1021) ?\n" "-\t\t\t\tadm1021_dir_table_template :\n" "-\t\t\t\tadm1021_max_dir_table_template);\n" "-\tif (err < 0)\n" @@ -328,7 +328,7 @@ "+\tdevice_create_file(&new_client->dev, &dev_attr_temp_min2);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_temp_input2);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_alarms);\n" - "+\tif (data->type = adm1021)\n" + "+\tif (data->type == adm1021)\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_die_code);\n" " \n" "-\tdata->sysctl_id = err;\n" @@ -382,12 +382,18 @@ "-#endif\n" "-\n" "-\t\tdata->temp = adm1021_read_value(client, ADM1021_REG_TEMP);\n" - "-\t\tdata->temp_os -\t\t adm1021_read_value(client, ADM1021_REG_TOS_R);\n" - "-\t\tdata->temp_hyst -\t\t adm1021_read_value(client, ADM1021_REG_THYST_R);\n" - "-\t\tdata->remote_temp -\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_TEMP);\n" - "-\t\tdata->remote_temp_os -\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R);\n" - "-\t\tdata->remote_temp_hyst -\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R);\n" - "-\t\tdata->alarms -\t\t adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec;\n" + "-\t\tdata->temp_os =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_TOS_R);\n" + "-\t\tdata->temp_hyst =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_THYST_R);\n" + "-\t\tdata->remote_temp =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_TEMP);\n" + "-\t\tdata->remote_temp_os =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R);\n" + "-\t\tdata->remote_temp_hyst =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R);\n" + "-\t\tdata->alarms =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec;\n" "+\t\tdata->temp_input = adm1021_read_value(client, ADM1021_REG_TEMP);\n" "+\t\tdata->temp_max = adm1021_read_value(client, ADM1021_REG_TOS_R);\n" "+\t\tdata->temp_hyst = adm1021_read_value(client, ADM1021_REG_THYST_R);\n" @@ -395,16 +401,22 @@ "+\t\tdata->remote_temp_max = adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R);\n" "+\t\tdata->remote_temp_hyst = adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R);\n" "+\t\tdata->alarms = adm1021_read_value(client, ADM1021_REG_STATUS) & 0xec;\n" - " \t\tif (data->type = adm1021)\n" - "-\t\t\tdata->die_code -\t\t\t adm1021_read_value(client,\n" + " \t\tif (data->type == adm1021)\n" + "-\t\t\tdata->die_code =\n" + "-\t\t\t adm1021_read_value(client,\n" "-\t\t\t\t\t ADM1021_REG_DIE_CODE);\n" "+\t\t\tdata->die_code = adm1021_read_value(client, ADM1021_REG_DIE_CODE);\n" - " \t\tif (data->type = adm1023) {\n" - "-\t\t data->remote_temp_prec -\t\t adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC);\n" - "-\t\t data->remote_temp_os_prec -\t\t adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC);\n" - "-\t\t data->remote_temp_hyst_prec -\t\t adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC);\n" - "-\t\t data->remote_temp_offset -\t\t adm1021_read_value(client, ADM1021_REG_REM_OFFSET);\n" - "-\t\t data->remote_temp_offset_prec -\t\t adm1021_read_value(client, ADM1021_REG_REM_OFFSET_PREC);\n" + " \t\tif (data->type == adm1023) {\n" + "-\t\t data->remote_temp_prec =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC);\n" + "-\t\t data->remote_temp_os_prec =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC);\n" + "-\t\t data->remote_temp_hyst_prec =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC);\n" + "-\t\t data->remote_temp_offset =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REM_OFFSET);\n" + "-\t\t data->remote_temp_offset_prec =\n" + "-\t\t adm1021_read_value(client, ADM1021_REG_REM_OFFSET_PREC);\n" "+\t\t\tdata->remote_temp_prec = adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC);\n" "+\t\t\tdata->remote_temp_os_prec = adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC);\n" "+\t\t\tdata->remote_temp_hyst_prec = adm1021_read_value(client, ADM1021_REG_REM_THYST_PREC);\n" @@ -425,7 +437,7 @@ " {\n" "@@ -442,15 +431,15 @@\n" " \t\t*nrels_mag = 0;\n" - " \telse if (operation = SENSORS_PROC_REAL_READ) {\n" + " \telse if (operation == SENSORS_PROC_REAL_READ) {\n" " \t\tadm1021_update_client(client);\n" "-\t\tresults[0] = TEMP_FROM_REG(data->temp_os);\n" "+\t\tresults[0] = TEMP_FROM_REG(data->temp_max);\n" @@ -433,7 +445,7 @@ "-\t\tresults[2] = TEMP_FROM_REG(data->temp);\n" "+\t\tresults[2] = TEMP_FROM_REG(data->temp_input);\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_os = TEMP_TO_REG(results[0]);\n" "+\t\t\tdata->temp_max = TEMP_TO_REG(results[0]);\n" @@ -453,14 +465,14 @@ " {\n" "@@ -471,68 +461,53 @@\n" " else { *nrels_mag = 0; }\n" - " \telse if (operation = SENSORS_PROC_REAL_READ) {\n" + " \telse if (operation == SENSORS_PROC_REAL_READ) {\n" " \t\tadm1021_update_client(client);\n" "-\t\tresults[0] = TEMP_FROM_REG(data->remote_temp_os);\n" "+\t\tresults[0] = TEMP_FROM_REG(data->remote_temp_max);\n" " \t\tresults[1] = TEMP_FROM_REG(data->remote_temp_hyst);\n" "-\t\tresults[2] = TEMP_FROM_REG(data->remote_temp);\n" "+\t\tresults[2] = TEMP_FROM_REG(data->remote_temp_input);\n" - " \t\tif (data->type = adm1023) {\n" + " \t\tif (data->type == adm1023) {\n" "-\t\t results[0]=results[0]*1000 + \n" "-\t\t ((data->remote_temp_os_prec >> 5) * 125);\n" "-\t\t results[1]=results[1]*1000 + \n" @@ -479,9 +491,9 @@ "- \t\t *nrels_mag = 3;\n" "+ \t\t\t*nrels_mag = 3;\n" " \t\t}\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\tif (data->type = adm1023) {\n" + " \t\t\tif (data->type == adm1023) {\n" "-\t\t\t prec=((results[0]-((results[0]/1000)*1000))/125)<<5;\n" "-\t\t\t adm1021_write_value(client,\n" "- ADM1021_REG_REM_TOS_PREC,\n" @@ -501,7 +513,7 @@ "+\t\t\tadm1021_write_value(client, ADM1021_REG_REMOTE_TOS_W, data->remote_temp_max);\n" " \t\t}\n" " \t\tif (*nrels_mag >= 2) {\n" - " \t\t\tif (data->type = adm1023) {\n" + " \t\t\tif (data->type == adm1023) {\n" "-\t\t\t prec=((results[1]-((results[1]/1000)*1000))/125)<<5;\n" "-\t\t\t adm1021_write_value(client,\n" "- ADM1021_REG_REM_THYST_PREC,\n" @@ -520,7 +532,7 @@ "+\t\t\tadm1021_write_value(client, ADM1021_REG_REMOTE_THYST_W, data->remote_temp_hyst);\n" " \t\t}\n" " \t\tif (*nrels_mag >= 3) {\n" - " \t\t\tif (data->type = adm1023) {\n" + " \t\t\tif (data->type == adm1023) {\n" "-\t\t\t prec=((results[2]-((results[2]/1000)*1000))/125)<<5;\n" "-\t\t\t adm1021_write_value(client,\n" "- ADM1021_REG_REM_OFFSET_PREC,\n" @@ -565,4 +577,4 @@ " MODULE_DESCRIPTION(\"adm1021 driver\");\n" " MODULE_LICENSE(\"GPL\");" -5e9ebceed0b1316c69b6ecd99d89f08aac7ce98f289f717aa2071db93379e463 +3bd78507d1196fc5e46449a22e76b3ba4cf9526ef35010a3dae81d584f312604
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.