diff for duplicates of <11018600192512@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 31bf6e2..9f02ab7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -307,11 +307,11 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + +/* FAN speed is measured using 22.5kHz clock and counts for 2 pulses + * and we assume a 2 pulse-per-rev fan tach signal -+ * 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) = 1350000 ++ * 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) == 1350000 + */ +#define FAN_TO_REG(val,div) ((val)<=0 ? 0xff : SENSORS_LIMIT(1350000/((val)*\ + (div)),1,254)) -+#define FAN_FROM_REG(val,div) ((val)=0?-1:(val)=0xff ? 0 : 1350000/((val)*\ ++#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==0xff ? 0 : 1350000/((val)*\ + (div))) +#define DIV_FROM_REG(val) (1<<(val)) +#define DIV_TO_REG(val) ((val)>=8 ? 3 : (val)>=4 ? 2 : (val)>=2 ? 1 : 0) @@ -482,7 +482,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + /* Inform user of chip config */ + dev_dbg(&client->dev, "(%d): ADM1026_REG_CONFIG1 is: 0x%02x\n", + client->id, data->config1); -+ if ((data->config1 & CFG1_MONITOR) = 0) { ++ if ((data->config1 & CFG1_MONITOR) == 0) { + dev_dbg(&client->dev, "(%d): Monitoring not currently " + "enabled.\n", client->id); + } @@ -520,7 +520,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + /* Read and pick apart the existing GPIO configuration */ + value = 0; + for (i = 0;i <= 15;++i) { -+ if ((i & 0x03) = 0) { ++ if ((i & 0x03) == 0) { + value = adm1026_read_value(client, + ADM1026_REG_GPIO_CFG_0_3 + i/4); + } @@ -535,7 +535,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + /* If the user asks us to reprogram the GPIO config, then + * do it now. But only if this is the first ADM1026. + */ -+ if (client->id = 0 ++ if (client->id == 0 + && (gpio_input[0] != -1 || gpio_output[0] != -1 + || gpio_inverted[0] != -1 || gpio_normal[0] != -1 + || gpio_fan[0] != -1)) { @@ -553,7 +553,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + * without first setting a value for pwm1.auto_pwm_min + * will not result in potentially dangerous fan speed decrease. + */ -+ data->pwm1.auto_pwm_min%5; ++ data->pwm1.auto_pwm_min=255; + /* Start monitoring */ + value = adm1026_read_value(client, ADM1026_REG_CONFIG1); + /* Set MONITOR, clear interrupt acknowledge and s/w reset */ @@ -661,7 +661,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + for (i = 15, value = 0;i >= 0;--i) { + value <<= 2; + value |= data->gpio_config[i] & 0x03; -+ if ((i & 0x03) = 0) { ++ if ((i & 0x03) == 0) { + adm1026_write_value(client, + ADM1026_REG_GPIO_CFG_0_3 + i/4, + value); @@ -688,17 +688,20 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + dev_dbg(&client->dev,"(%d): Reading sensor values\n", + client->id); + for (i = 0;i <= 16;++i) { -+ data->in[i] + adm1026_read_value(client, ADM1026_REG_IN[i]); ++ data->in[i] = ++ adm1026_read_value(client, ADM1026_REG_IN[i]); + } + + for (i = 0;i <= 7;++i) { -+ data->fan[i] + adm1026_read_value(client, ADM1026_REG_FAN(i)); ++ data->fan[i] = ++ adm1026_read_value(client, ADM1026_REG_FAN(i)); + } + + for (i = 0;i <= 2;++i) { + /* NOTE: temp[] is s8 and we assume 2's complement + * "conversion" in the assignment */ -+ data->temp[i] + adm1026_read_value(client, ADM1026_REG_TEMP[i]); ++ data->temp[i] = ++ adm1026_read_value(client, ADM1026_REG_TEMP[i]); + } + + data->pwm1.pwm = adm1026_read_value(client, @@ -801,7 +804,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + + value = 0; + for (i = 0;i <= 15;++i) { -+ if ((i & 0x03) = 0) { ++ if ((i & 0x03) == 0) { + value = adm1026_read_value(client, + ADM1026_REG_GPIO_CFG_0_3 + i/4); + } @@ -1029,7 +1032,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + int new_div = data->fan_div[fan]; + + /* 0 and 0xff are special. Don't adjust them */ -+ if (data->fan_min[fan] = 0 || data->fan_min[fan] = 0xff) { ++ if (data->fan_min[fan] == 0 || data->fan_min[fan] == 0xff) { + return; + } + @@ -1054,7 +1057,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + + val = simple_strtol(buf, NULL, 10); + new_div = DIV_TO_REG(val); -+ if (new_div = 0) { ++ if (new_div == 0) { + return -EINVAL; + } + down(&data->update_lock); @@ -1302,7 +1305,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + int val; + + val = simple_strtol(buf, NULL, 10); -+ if ((val = 1) || (val=0)) { ++ if ((val == 1) || (val==0)) { + down(&data->update_lock); + data->config1 = (data->config1 & ~CFG1_THERM_HOT) | (val << 4); + adm1026_write_value(client, ADM1026_REG_CONFIG1, @@ -1522,7 +1525,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + struct adm1026_data *data = i2c_get_clientdata(client); + int val; + -+ if (data->pwm1.enable = 1) { ++ if (data->pwm1.enable == 1) { + down(&data->update_lock); + val = simple_strtol(buf, NULL, 10); + data->pwm1.pwm = PWM_TO_REG(val); @@ -1546,7 +1549,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + down(&data->update_lock); + val = simple_strtol(buf, NULL, 10); + data->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255); -+ if (data->pwm1.enable = 2) { /* apply immediately */ ++ if (data->pwm1.enable == 2) { /* apply immediately */ + data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) | + PWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); + adm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm); @@ -1577,15 +1580,15 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + old_enable = data->pwm1.enable; + data->pwm1.enable = val; + data->config1 = (data->config1 & ~CFG1_PWM_AFC) -+ | ((val = 2) ? CFG1_PWM_AFC : 0); ++ | ((val == 2) ? CFG1_PWM_AFC : 0); + adm1026_write_value(client, ADM1026_REG_CONFIG1, + data->config1); -+ if (val = 2) { /* apply pwm1_auto_pwm_min to pwm1 */ ++ if (val == 2) { /* apply pwm1_auto_pwm_min to pwm1 */ + data->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) | + PWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); + adm1026_write_value(client, ADM1026_REG_PWM, + data->pwm1.pwm); -+ } else if (!((old_enable = 1) && (val = 1))) { ++ } else if (!((old_enable == 1) && (val == 1))) { + /* set pwm to safe value */ + data->pwm1.pwm = 255; + adm1026_write_value(client, ADM1026_REG_PWM, @@ -1663,15 +1666,15 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + if (kind <= 0) { + dev_dbg(&new_client->dev, "Autodetecting device at %d,0x%02x " + "...\n", i2c_adapter_id(adapter), address); -+ if (company = ADM1026_COMPANY_ANALOG_DEV -+ && verstep = ADM1026_VERSTEP_ADM1026) { ++ if (company == ADM1026_COMPANY_ANALOG_DEV ++ && verstep == ADM1026_VERSTEP_ADM1026) { + kind = adm1026; -+ } else if (company = ADM1026_COMPANY_ANALOG_DEV -+ && (verstep & 0xf0) = ADM1026_VERSTEP_GENERIC) { ++ } else if (company == ADM1026_COMPANY_ANALOG_DEV ++ && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { + dev_err(&adapter->dev, ": Unrecognized stepping " + "0x%02x. Defaulting to ADM1026.\n", verstep); + kind = adm1026; -+ } else if ((verstep & 0xf0) = ADM1026_VERSTEP_GENERIC) { ++ } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { + dev_err(&adapter->dev, ": Found version/stepping " + "0x%02x. Assuming generic ADM1026.\n", + verstep); @@ -1680,7 +1683,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c + dev_dbg(&new_client->dev, ": Autodetection " + "failed\n"); + /* Not an ADM1026 ... */ -+ if (kind = 0) { /* User used force=x,y */ ++ if (kind == 0) { /* User used force=x,y */ + dev_err(&adapter->dev, "Generic ADM1026 not " + "found at %d,0x%02x. Try " + "force_adm1026.\n", diff --git a/a/content_digest b/N1/content_digest index ff34671..bde7134 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011018600193456@kroah.com\0" - "ref\020041119220001.GB15956@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C fixes for 2.6.10-rc2\0" - "Date\0Thu, 19 May 2005 06:25:25 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C fixes for 2.6.10-rc2\0" + "Date\0Tue, 30 Nov 2004 16:13:39 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -316,11 +315,11 @@ "+\n" "+/* FAN speed is measured using 22.5kHz clock and counts for 2 pulses\n" "+ * and we assume a 2 pulse-per-rev fan tach signal\n" - "+ * 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) = 1350000\n" + "+ * 22500 kHz * 60 (sec/min) * 2 (pulse) / 2 (pulse/rev) == 1350000\n" "+ */\n" "+#define FAN_TO_REG(val,div) ((val)<=0 ? 0xff : SENSORS_LIMIT(1350000/((val)*\\\n" "+\t(div)),1,254)) \n" - "+#define FAN_FROM_REG(val,div) ((val)=0?-1:(val)=0xff ? 0 : 1350000/((val)*\\\n" + "+#define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==0xff ? 0 : 1350000/((val)*\\\n" "+\t(div)))\n" "+#define DIV_FROM_REG(val) (1<<(val))\n" "+#define DIV_TO_REG(val) ((val)>=8 ? 3 : (val)>=4 ? 2 : (val)>=2 ? 1 : 0)\n" @@ -491,7 +490,7 @@ "+\t/* Inform user of chip config */\n" "+\tdev_dbg(&client->dev, \"(%d): ADM1026_REG_CONFIG1 is: 0x%02x\\n\",\n" "+\t\tclient->id, data->config1);\n" - "+\tif ((data->config1 & CFG1_MONITOR) = 0) {\n" + "+\tif ((data->config1 & CFG1_MONITOR) == 0) {\n" "+\t\tdev_dbg(&client->dev, \"(%d): Monitoring not currently \"\n" "+\t\t\t\"enabled.\\n\", client->id);\n" "+\t}\n" @@ -529,7 +528,7 @@ "+\t/* Read and pick apart the existing GPIO configuration */\n" "+\tvalue = 0;\n" "+\tfor (i = 0;i <= 15;++i) {\n" - "+\t\tif ((i & 0x03) = 0) {\n" + "+\t\tif ((i & 0x03) == 0) {\n" "+\t\t\tvalue = adm1026_read_value(client,\n" "+\t\t\t\t\tADM1026_REG_GPIO_CFG_0_3 + i/4);\n" "+\t\t}\n" @@ -544,7 +543,7 @@ "+\t/* If the user asks us to reprogram the GPIO config, then\n" "+\t * do it now. But only if this is the first ADM1026.\n" "+\t */\n" - "+\tif (client->id = 0\n" + "+\tif (client->id == 0\n" "+\t && (gpio_input[0] != -1 || gpio_output[0] != -1\n" "+\t\t|| gpio_inverted[0] != -1 || gpio_normal[0] != -1\n" "+\t\t|| gpio_fan[0] != -1)) {\n" @@ -562,7 +561,7 @@ "+\t * without first setting a value for pwm1.auto_pwm_min \n" "+\t * will not result in potentially dangerous fan speed decrease.\n" "+\t */\n" - "+\tdata->pwm1.auto_pwm_min%5;\n" + "+\tdata->pwm1.auto_pwm_min=255;\n" "+\t/* Start monitoring */\n" "+\tvalue = adm1026_read_value(client, ADM1026_REG_CONFIG1);\n" "+\t/* Set MONITOR, clear interrupt acknowledge and s/w reset */\n" @@ -670,7 +669,7 @@ "+\tfor (i = 15, value = 0;i >= 0;--i) {\n" "+\t\tvalue <<= 2;\n" "+\t\tvalue |= data->gpio_config[i] & 0x03;\n" - "+\t\tif ((i & 0x03) = 0) {\n" + "+\t\tif ((i & 0x03) == 0) {\n" "+\t\t\tadm1026_write_value(client,\n" "+\t\t\t\t\tADM1026_REG_GPIO_CFG_0_3 + i/4,\n" "+\t\t\t\t\tvalue);\n" @@ -697,17 +696,20 @@ "+\t\tdev_dbg(&client->dev,\"(%d): Reading sensor values\\n\", \n" "+\t\t\tclient->id);\n" "+\t\tfor (i = 0;i <= 16;++i) {\n" - "+\t\t\tdata->in[i] +\t\t\t adm1026_read_value(client, ADM1026_REG_IN[i]);\n" + "+\t\t\tdata->in[i] =\n" + "+\t\t\t adm1026_read_value(client, ADM1026_REG_IN[i]);\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0;i <= 7;++i) {\n" - "+\t\t\tdata->fan[i] +\t\t\t adm1026_read_value(client, ADM1026_REG_FAN(i));\n" + "+\t\t\tdata->fan[i] =\n" + "+\t\t\t adm1026_read_value(client, ADM1026_REG_FAN(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0;i <= 2;++i) {\n" "+\t\t\t/* NOTE: temp[] is s8 and we assume 2's complement\n" "+\t\t\t * \"conversion\" in the assignment */\n" - "+\t\t\tdata->temp[i] +\t\t\t adm1026_read_value(client, ADM1026_REG_TEMP[i]);\n" + "+\t\t\tdata->temp[i] =\n" + "+\t\t\t adm1026_read_value(client, ADM1026_REG_TEMP[i]);\n" "+\t\t}\n" "+\n" "+\t\tdata->pwm1.pwm = adm1026_read_value(client, \n" @@ -810,7 +812,7 @@ "+\n" "+\t\tvalue = 0;\n" "+\t\tfor (i = 0;i <= 15;++i) {\n" - "+\t\t\tif ((i & 0x03) = 0) {\n" + "+\t\t\tif ((i & 0x03) == 0) {\n" "+\t\t\t\tvalue = adm1026_read_value(client,\n" "+\t\t\t\t\t ADM1026_REG_GPIO_CFG_0_3 + i/4);\n" "+\t\t\t}\n" @@ -1038,7 +1040,7 @@ "+\tint new_div = data->fan_div[fan];\n" "+\n" "+\t/* 0 and 0xff are special. Don't adjust them */\n" - "+\tif (data->fan_min[fan] = 0 || data->fan_min[fan] = 0xff) {\n" + "+\tif (data->fan_min[fan] == 0 || data->fan_min[fan] == 0xff) {\n" "+\t\treturn;\n" "+\t}\n" "+\n" @@ -1063,7 +1065,7 @@ "+\n" "+\tval = simple_strtol(buf, NULL, 10);\n" "+\tnew_div = DIV_TO_REG(val); \n" - "+\tif (new_div = 0) {\n" + "+\tif (new_div == 0) {\n" "+\t\treturn -EINVAL;\n" "+\t}\n" "+\tdown(&data->update_lock);\n" @@ -1311,7 +1313,7 @@ "+\tint val;\n" "+\n" "+\tval = simple_strtol(buf, NULL, 10);\n" - "+\tif ((val = 1) || (val=0)) {\n" + "+\tif ((val == 1) || (val==0)) {\n" "+\t\tdown(&data->update_lock);\n" "+\t\tdata->config1 = (data->config1 & ~CFG1_THERM_HOT) | (val << 4);\n" "+\t\tadm1026_write_value(client, ADM1026_REG_CONFIG1, \n" @@ -1531,7 +1533,7 @@ "+\tstruct adm1026_data *data = i2c_get_clientdata(client);\n" "+\tint val;\n" "+\n" - "+\tif (data->pwm1.enable = 1) {\n" + "+\tif (data->pwm1.enable == 1) {\n" "+\t\tdown(&data->update_lock);\n" "+\t\tval = simple_strtol(buf, NULL, 10);\n" "+\t\tdata->pwm1.pwm = PWM_TO_REG(val);\n" @@ -1555,7 +1557,7 @@ "+\tdown(&data->update_lock);\n" "+\tval = simple_strtol(buf, NULL, 10);\n" "+\tdata->pwm1.auto_pwm_min = SENSORS_LIMIT(val,0,255);\n" - "+\tif (data->pwm1.enable = 2) { /* apply immediately */\n" + "+\tif (data->pwm1.enable == 2) { /* apply immediately */\n" "+\t\tdata->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) |\n" "+\t\t\tPWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); \n" "+\t\tadm1026_write_value(client, ADM1026_REG_PWM, data->pwm1.pwm);\n" @@ -1586,15 +1588,15 @@ "+\t\told_enable = data->pwm1.enable;\n" "+\t\tdata->pwm1.enable = val;\n" "+\t\tdata->config1 = (data->config1 & ~CFG1_PWM_AFC)\n" - "+\t\t\t\t| ((val = 2) ? CFG1_PWM_AFC : 0);\n" + "+\t\t\t\t| ((val == 2) ? CFG1_PWM_AFC : 0);\n" "+\t\tadm1026_write_value(client, ADM1026_REG_CONFIG1,\n" "+\t\t\tdata->config1);\n" - "+\t\tif (val = 2) { /* apply pwm1_auto_pwm_min to pwm1 */\n" + "+\t\tif (val == 2) { /* apply pwm1_auto_pwm_min to pwm1 */\n" "+\t\t\tdata->pwm1.pwm = PWM_TO_REG((data->pwm1.pwm & 0x0f) |\n" "+\t\t\t\tPWM_MIN_TO_REG(data->pwm1.auto_pwm_min)); \n" "+\t\t\tadm1026_write_value(client, ADM1026_REG_PWM, \n" "+\t\t\t\tdata->pwm1.pwm);\n" - "+\t\t} else if (!((old_enable = 1) && (val = 1))) {\n" + "+\t\t} else if (!((old_enable == 1) && (val == 1))) {\n" "+\t\t\t/* set pwm to safe value */\n" "+\t\t\tdata->pwm1.pwm = 255;\n" "+\t\t\tadm1026_write_value(client, ADM1026_REG_PWM, \n" @@ -1672,15 +1674,15 @@ "+\tif (kind <= 0) {\n" "+\t\tdev_dbg(&new_client->dev, \"Autodetecting device at %d,0x%02x \"\n" "+\t\t\t\"...\\n\", i2c_adapter_id(adapter), address);\n" - "+\t\tif (company = ADM1026_COMPANY_ANALOG_DEV\n" - "+\t\t && verstep = ADM1026_VERSTEP_ADM1026) {\n" + "+\t\tif (company == ADM1026_COMPANY_ANALOG_DEV\n" + "+\t\t && verstep == ADM1026_VERSTEP_ADM1026) {\n" "+\t\t\tkind = adm1026;\n" - "+\t\t} else if (company = ADM1026_COMPANY_ANALOG_DEV\n" - "+\t\t\t&& (verstep & 0xf0) = ADM1026_VERSTEP_GENERIC) {\n" + "+\t\t} else if (company == ADM1026_COMPANY_ANALOG_DEV\n" + "+\t\t\t&& (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {\n" "+\t\t\tdev_err(&adapter->dev, \": Unrecognized stepping \"\n" "+\t\t\t\t\"0x%02x. Defaulting to ADM1026.\\n\", verstep);\n" "+\t\t\tkind = adm1026;\n" - "+\t\t} else if ((verstep & 0xf0) = ADM1026_VERSTEP_GENERIC) {\n" + "+\t\t} else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {\n" "+\t\t\tdev_err(&adapter->dev, \": Found version/stepping \"\n" "+\t\t\t\t\"0x%02x. Assuming generic ADM1026.\\n\",\n" "+\t\t\t\tverstep);\n" @@ -1689,7 +1691,7 @@ "+\t\t\tdev_dbg(&new_client->dev, \": Autodetection \"\n" "+\t\t\t\t\"failed\\n\");\n" "+\t\t\t/* Not an ADM1026 ... */\n" - "+\t\t\tif (kind = 0) { /* User used force=x,y */\n" + "+\t\t\tif (kind == 0) { /* User used force=x,y */\n" "+\t\t\t\tdev_err(&adapter->dev, \"Generic ADM1026 not \"\n" "+\t\t\t\t\t\"found at %d,0x%02x. Try \"\n" "+\t\t\t\t\t\"force_adm1026.\\n\",\n" @@ -1894,4 +1896,4 @@ "+module_init(sm_adm1026_init);\n" +module_exit(sm_adm1026_exit); -c1d1dad8912058d1ab915476c48b1e440e771c31c9351dafd5757f297073e3f9 +4eaad45188f94a69d430e036aef3512f2b738576fd9f1c8714ffc897c4ed5245
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.