diff for duplicates of <20041102164642.GA16378@penguincomputing.com> diff --git a/a/1.txt b/N1/1.txt index c9f90fa..0014e3b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -253,11 +253,11 @@ static int adm1026_scaling[] = { /* .001 Volts */ /* 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) @@ -428,7 +428,7 @@ void adm1026_init_client(struct i2c_client *client) /* 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); } @@ -466,7 +466,7 @@ void adm1026_init_client(struct i2c_client *client) /* 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); } @@ -481,7 +481,7 @@ void adm1026_init_client(struct i2c_client *client) /* 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)) { @@ -499,7 +499,7 @@ void adm1026_init_client(struct i2c_client *client) * 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 */ @@ -607,7 +607,7 @@ void adm1026_fixup_gpio(struct i2c_client *client) 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); @@ -634,17 +634,20 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) 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, @@ -747,7 +750,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) 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); } @@ -975,7 +978,7 @@ void fixup_fan_min(struct device *dev, int fan, int old_div) 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; } @@ -1000,7 +1003,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, 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); @@ -1247,7 +1250,7 @@ static ssize_t set_temp_crit_enable(struct device *dev, const char *buf, 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, @@ -1468,7 +1471,7 @@ static ssize_t set_pwm_reg(struct device *dev, const char *buf, 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); @@ -1500,7 +1503,7 @@ static ssize_t set_auto_pwm_min(struct device *dev, const char *buf, 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 */ return store_auto_pwm_min(client, data, count); } else { /* wait til automatic fan control is enabled to apply */ up(&data->update_lock); @@ -1526,12 +1529,12 @@ static ssize_t set_pwm_enable(struct device *dev, const char *buf, if ((val >= 0) && (val < 3)) { 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 */ return store_auto_pwm_min(client, data, count); - } else if (!((old_enable = 1) && (val = 1))) { + } else if (!((old_enable == 1) && (val == 1))) { /* set pwm to safe value */ data->pwm1.pwm = 255; return store_pwm_reg(client, data, count); @@ -1594,15 +1597,15 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 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); @@ -1611,7 +1614,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 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 82f9122..c7dadad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\020041025210057.GB19053@penguincomputing.com\0" "ref\0GNXY8AG6.1098776962.4770080.khali@gcu.info\0" "ref\020041029191229.GB803@penguincomputing.com\0" - "From\0jthiessen@penguincomputing.com (Justin Thiessen)\0" - "Subject\0adm1026 driver port for kernel 2.6.X - [REVISED DRIVER]\0" - "Date\0Thu, 19 May 2005 06:25:21 +0000\0" + "From\0Justin Thiessen <jthiessen@penguincomputing.com>\0" + "Subject\0Re: adm1026 driver port for kernel 2.6.X - [REVISED DRIVER]\0" + "Date\0Tue, 2 Nov 2004 08:46:42 -0800\0" "To\0phil@netroedge.com\0" "Cc\0sensors@stimpy.netroedge.com" Greg KH <greg@kroah.com> @@ -266,11 +266,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" @@ -441,7 +441,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" @@ -479,7 +479,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" @@ -494,7 +494,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" @@ -512,7 +512,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" @@ -620,7 +620,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" @@ -647,17 +647,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" @@ -760,7 +763,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" @@ -988,7 +991,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" @@ -1013,7 +1016,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" @@ -1260,7 +1263,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" @@ -1481,7 +1484,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" @@ -1513,7 +1516,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\treturn store_auto_pwm_min(client, data, count);\n" "\t} else { /* wait til automatic fan control is enabled to apply */\n" "\t\tup(&data->update_lock);\n" @@ -1539,12 +1542,12 @@ "\tif ((val >= 0) && (val < 3)) {\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\treturn store_auto_pwm_min(client, data, count);\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\treturn store_pwm_reg(client, data, count);\n" @@ -1607,15 +1610,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" @@ -1624,7 +1627,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" @@ -1818,4 +1821,4 @@ "module_init(sm_adm1026_init);\n" module_exit(sm_adm1026_exit); -4cf25d5c69ff57a458be24c787aacf2ea980030eabe530323614254638bf2745 +1dccb2d42cd07cd7a7bb2fa1f55884232267b3c5708c89c3c818bc2a3827a125
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.