diff for duplicates of <10553638062379@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 01fb493..7d694d4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -203,7 +203,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + these macros are called: arguments may be evaluated more than once. + */ + -+/* IN are scaled 1.000 = 0xc0, mag = 3 */ ++/* IN are scaled 1.000 == 0xc0, mag = 3 */ +#define IN_TO_REG(val) (SENSORS_LIMIT((((val)*0xc0+500)/1000),0,255)) +#define INEXT_FROM_REG(val,ext) (((val)*1000 + (ext)*250 + 96)/0xc0) +#define IN_FROM_REG(val) (INEXT_FROM_REG(val,0)) @@ -222,7 +222,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + +/* FAN speed is measured using 90kHz clock */ +#define FAN_TO_REG(val) (SENSORS_LIMIT( (val)<=0?0: 5400000/(val),0,65534)) -+#define FAN_FROM_REG(val) ((val)=0?-1:(val)=0xffff?0:5400000/(val)) ++#define FAN_FROM_REG(val) ((val)==0?-1:(val)==0xffff?0:5400000/(val)) + +/* Temperature is reported in .01 degC increments */ +#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)+50)/100,-127,127)) @@ -350,7 +350,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + int i; + + for( i = 0 ; i <= 7 ; ++i ) -+ if( zone = lm85_zone_map[i] ) ++ if( zone == lm85_zone_map[i] ) + break ; + if( i > 7 ) /* Not found. */ + i = 3; /* Always 100% */ @@ -862,29 +862,29 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + printk("lm85: Autodetecting device at %d,0x%02x ...\n", + i2c_adapter_id(adapter), address ); + } -+ if( company = LM85_COMPANY_NATIONAL -+ && verstep = LM85_VERSTEP_LM85C ) { ++ if( company == LM85_COMPANY_NATIONAL ++ && verstep == LM85_VERSTEP_LM85C ) { + kind = lm85c ; -+ } else if( company = LM85_COMPANY_NATIONAL -+ && verstep = LM85_VERSTEP_LM85B ) { ++ } else if( company == LM85_COMPANY_NATIONAL ++ && verstep == LM85_VERSTEP_LM85B ) { + kind = lm85b ; -+ } else if( company = LM85_COMPANY_NATIONAL -+ && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { ++ } else if( company == LM85_COMPANY_NATIONAL ++ && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { + printk("lm85: Unrecgonized version/stepping 0x%02x" + " Defaulting to LM85.\n", verstep ); + kind = any_chip ; -+ } else if( company = LM85_COMPANY_ANALOG_DEV -+ && verstep = LM85_VERSTEP_ADM1027 ) { ++ } else if( company == LM85_COMPANY_ANALOG_DEV ++ && verstep == LM85_VERSTEP_ADM1027 ) { + kind = adm1027 ; -+ } else if( company = LM85_COMPANY_ANALOG_DEV -+ && verstep = LM85_VERSTEP_ADT7463 ) { ++ } else if( company == LM85_COMPANY_ANALOG_DEV ++ && verstep == LM85_VERSTEP_ADT7463 ) { + kind = adt7463 ; -+ } else if( company = LM85_COMPANY_ANALOG_DEV -+ && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) { ++ } else if( company == LM85_COMPANY_ANALOG_DEV ++ && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) { + printk("lm85: Unrecgonized version/stepping 0x%02x" + " Defaulting to ADM1027.\n", verstep ); + kind = adm1027 ; -+ } else if( kind = 0 && (verstep & 0xf0) = 0x60) { ++ } else if( kind == 0 && (verstep & 0xf0) == 0x60) { + printk("lm85: Generic LM85 Version 6 detected\n"); + /* Leave kind as "any_chip" */ + } else { @@ -892,7 +892,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + printk("lm85: Autodetection failed\n"); + } + /* Not an LM85 ... */ -+ if( kind = 0 ) { /* User used force=x,y */ ++ if( kind == 0 ) { /* User used force=x,y */ + printk("lm85: Generic LM85 Version 6 not" + " found at %d,0x%02x. Try force_lm85c.\n", + i2c_adapter_id(adapter), address ); @@ -903,19 +903,19 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + } + + /* Fill in the chip specific driver values */ -+ if ( kind = any_chip ) { ++ if ( kind == any_chip ) { + type_name = "lm85"; + strlcpy(new_client->dev.name, "Generic LM85", DEVICE_NAME_SIZE); -+ } else if ( kind = lm85b ) { ++ } else if ( kind == lm85b ) { + type_name = "lm85b"; + strlcpy(new_client->dev.name, "National LM85-B", DEVICE_NAME_SIZE); -+ } else if ( kind = lm85c ) { ++ } else if ( kind == lm85c ) { + type_name = "lm85c"; + strlcpy(new_client->dev.name, "National LM85-C", DEVICE_NAME_SIZE); -+ } else if ( kind = adm1027 ) { ++ } else if ( kind == adm1027 ) { + type_name = "adm1027"; + strlcpy(new_client->dev.name, "Analog Devices ADM1027", DEVICE_NAME_SIZE); -+ } else if ( kind = adt7463 ) { ++ } else if ( kind == adt7463 ) { + type_name = "adt7463"; + strlcpy(new_client->dev.name, "Analog Devices ADT7463", DEVICE_NAME_SIZE); + } else { @@ -1090,8 +1090,8 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + i2c_adapter_id(client->adapter), client->addr ); + }; + if( value & 0x10 -+ && ( data->type = adm1027 -+ || data->type = adt7463 ) ) { ++ && ( data->type == adm1027 ++ || data->type == adt7463 ) ) { + printk("lm85(%d): Client (%d,0x%02x) VxI mode is set. " + "Please report this to the lm85 maintainer.\n", + client->id, @@ -1134,29 +1134,35 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + /* Have to read extended bits first to "freeze" the + * more significant bits that are read later. + */ -+ if ( (data->type = adm1027) || (data->type = adt7463) ) { -+ data->extend_adc + lm85_read_value(client, ADM1027_REG_EXTEND_ADC1); ++ if ( (data->type == adm1027) || (data->type == adt7463) ) { ++ data->extend_adc = ++ lm85_read_value(client, ADM1027_REG_EXTEND_ADC1); + } + + for (i = 0; i <= 4; ++i) { -+ data->in[i] + lm85_read_value(client, LM85_REG_IN(i)); ++ data->in[i] = ++ lm85_read_value(client, LM85_REG_IN(i)); + } + + for (i = 0; i <= 3; ++i) { -+ data->fan[i] + lm85_read_value(client, LM85_REG_FAN(i)); ++ data->fan[i] = ++ lm85_read_value(client, LM85_REG_FAN(i)); + } + + for (i = 0; i <= 2; ++i) { -+ data->temp[i] + lm85_read_value(client, LM85_REG_TEMP(i)); ++ data->temp[i] = ++ lm85_read_value(client, LM85_REG_TEMP(i)); + } + + for (i = 0; i <= 2; ++i) { -+ data->pwm[i] + lm85_read_value(client, LM85_REG_PWM(i)); ++ data->pwm[i] = ++ lm85_read_value(client, LM85_REG_PWM(i)); + } + -+ if ( data->type = adt7463 ) { ++ if ( data->type == adt7463 ) { + if( data->therm_total < ULONG_MAX - 256 ) { -+ data->therm_total ++ lm85_read_value(client, ADT7463_REG_THERM ); ++ data->therm_total += ++ lm85_read_value(client, ADT7463_REG_THERM ); + } + } + @@ -1173,30 +1179,39 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + printk("lm85(%d): Reading config values\n", client->id); + } + for (i = 0; i <= 4; ++i) { -+ data->in_min[i] + lm85_read_value(client, LM85_REG_IN_MIN(i)); -+ data->in_max[i] + lm85_read_value(client, LM85_REG_IN_MAX(i)); ++ data->in_min[i] = ++ lm85_read_value(client, LM85_REG_IN_MIN(i)); ++ data->in_max[i] = ++ lm85_read_value(client, LM85_REG_IN_MAX(i)); + } + + for (i = 0; i <= 3; ++i) { -+ data->fan_min[i] + lm85_read_value(client, LM85_REG_FAN_MIN(i)); ++ data->fan_min[i] = ++ lm85_read_value(client, LM85_REG_FAN_MIN(i)); + } + + for (i = 0; i <= 2; ++i) { -+ data->temp_min[i] + lm85_read_value(client, LM85_REG_TEMP_MIN(i)); -+ data->temp_max[i] + lm85_read_value(client, LM85_REG_TEMP_MAX(i)); ++ data->temp_min[i] = ++ lm85_read_value(client, LM85_REG_TEMP_MIN(i)); ++ data->temp_max[i] = ++ lm85_read_value(client, LM85_REG_TEMP_MAX(i)); + } + + data->vid = lm85_read_value(client, LM85_REG_VID); + + for (i = 0; i <= 2; ++i) { + int val ; -+ data->autofan[i].config + lm85_read_value(client, LM85_REG_AFAN_CONFIG(i)); ++ data->autofan[i].config = ++ lm85_read_value(client, LM85_REG_AFAN_CONFIG(i)); + val = lm85_read_value(client, LM85_REG_AFAN_RANGE(i)); + data->autofan[i].freq = val & 0x07 ; + data->zone[i].range = (val >> 4) & 0x0f ; -+ data->autofan[i].min_pwm + lm85_read_value(client, LM85_REG_AFAN_MINPWM(i)); -+ data->zone[i].limit + lm85_read_value(client, LM85_REG_AFAN_LIMIT(i)); -+ data->zone[i].critical + lm85_read_value(client, LM85_REG_AFAN_CRITICAL(i)); ++ data->autofan[i].min_pwm = ++ lm85_read_value(client, LM85_REG_AFAN_MINPWM(i)); ++ data->zone[i].limit = ++ lm85_read_value(client, LM85_REG_AFAN_LIMIT(i)); ++ data->zone[i].critical = ++ lm85_read_value(client, LM85_REG_AFAN_CRITICAL(i)); + } + + i = lm85_read_value(client, LM85_REG_AFAN_SPIKE1); @@ -1216,13 +1231,13 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c + i = lm85_read_value(client, LM85_REG_AFAN_HYST2); + data->zone[2].hyst = (i>>4) & 0x0f ; + -+ if ( (data->type = lm85b) || (data->type = lm85c) ) { ++ if ( (data->type == lm85b) || (data->type == lm85c) ) { + data->tach_mode = lm85_read_value(client, + LM85_REG_TACH_MODE ); + data->spinup_ctl = lm85_read_value(client, + LM85_REG_SPINUP_CTL ); -+ } else if ( (data->type = adt7463) || (data->type = adm1027) ) { -+ if ( data->type = adt7463 ) { ++ } else if ( (data->type == adt7463) || (data->type == adm1027) ) { ++ if ( data->type == adt7463 ) { + for (i = 0; i <= 2; ++i) { + data->oppoint[i] = lm85_read_value(client, + ADT7463_REG_OPPOINT(i) ); diff --git a/a/content_digest b/N1/content_digest index b21800d..6be888e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\020030611203544.GA26458@kroah.com\0" - "ref\01048295086481@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] More i2c driver changes for 2.5.70\0" - "Date\0Thu, 19 May 2005 06:23:59 +0000\0" + "Date\0Wed, 11 Jun 2003 13:36:46 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -212,7 +211,7 @@ "+ these macros are called: arguments may be evaluated more than once.\n" "+ */\n" "+\n" - "+/* IN are scaled 1.000 = 0xc0, mag = 3 */\n" + "+/* IN are scaled 1.000 == 0xc0, mag = 3 */\n" "+#define IN_TO_REG(val)\t\t(SENSORS_LIMIT((((val)*0xc0+500)/1000),0,255))\n" "+#define INEXT_FROM_REG(val,ext) (((val)*1000 + (ext)*250 + 96)/0xc0)\n" "+#define IN_FROM_REG(val)\t(INEXT_FROM_REG(val,0))\n" @@ -231,7 +230,7 @@ "+\n" "+/* FAN speed is measured using 90kHz clock */\n" "+#define FAN_TO_REG(val)\t\t(SENSORS_LIMIT( (val)<=0?0: 5400000/(val),0,65534))\n" - "+#define FAN_FROM_REG(val)\t((val)=0?-1:(val)=0xffff?0:5400000/(val))\n" + "+#define FAN_FROM_REG(val)\t((val)==0?-1:(val)==0xffff?0:5400000/(val))\n" "+\n" "+/* Temperature is reported in .01 degC increments */\n" "+#define TEMP_TO_REG(val)\t\t(SENSORS_LIMIT(((val)+50)/100,-127,127))\n" @@ -359,7 +358,7 @@ "+\tint i;\n" "+\n" "+\tfor( i = 0 ; i <= 7 ; ++i )\n" - "+\t\tif( zone = lm85_zone_map[i] )\n" + "+\t\tif( zone == lm85_zone_map[i] )\n" "+\t\t\tbreak ;\n" "+\tif( i > 7 ) /* Not found. */\n" "+\t\ti = 3; /* Always 100% */\n" @@ -871,29 +870,29 @@ "+\t\t\tprintk(\"lm85: Autodetecting device at %d,0x%02x ...\\n\",\n" "+\t\t\ti2c_adapter_id(adapter), address );\n" "+\t\t}\n" - "+\t\tif( company = LM85_COMPANY_NATIONAL\n" - "+\t\t && verstep = LM85_VERSTEP_LM85C ) {\n" + "+\t\tif( company == LM85_COMPANY_NATIONAL\n" + "+\t\t && verstep == LM85_VERSTEP_LM85C ) {\n" "+\t\t\tkind = lm85c ;\n" - "+\t\t} else if( company = LM85_COMPANY_NATIONAL\n" - "+\t\t && verstep = LM85_VERSTEP_LM85B ) {\n" + "+\t\t} else if( company == LM85_COMPANY_NATIONAL\n" + "+\t\t && verstep == LM85_VERSTEP_LM85B ) {\n" "+\t\t\tkind = lm85b ;\n" - "+\t\t} else if( company = LM85_COMPANY_NATIONAL\n" - "+\t\t && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) {\n" + "+\t\t} else if( company == LM85_COMPANY_NATIONAL\n" + "+\t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" "+\t\t\tprintk(\"lm85: Unrecgonized version/stepping 0x%02x\"\n" "+\t\t\t \" Defaulting to LM85.\\n\", verstep );\n" "+\t\t\tkind = any_chip ;\n" - "+\t\t} else if( company = LM85_COMPANY_ANALOG_DEV\n" - "+\t\t && verstep = LM85_VERSTEP_ADM1027 ) {\n" + "+\t\t} else if( company == LM85_COMPANY_ANALOG_DEV\n" + "+\t\t && verstep == LM85_VERSTEP_ADM1027 ) {\n" "+\t\t\tkind = adm1027 ;\n" - "+\t\t} else if( company = LM85_COMPANY_ANALOG_DEV\n" - "+\t\t && verstep = LM85_VERSTEP_ADT7463 ) {\n" + "+\t\t} else if( company == LM85_COMPANY_ANALOG_DEV\n" + "+\t\t && verstep == LM85_VERSTEP_ADT7463 ) {\n" "+\t\t\tkind = adt7463 ;\n" - "+\t\t} else if( company = LM85_COMPANY_ANALOG_DEV\n" - "+\t\t && (verstep & 0xf0) = LM85_VERSTEP_GENERIC ) {\n" + "+\t\t} else if( company == LM85_COMPANY_ANALOG_DEV\n" + "+\t\t && (verstep & 0xf0) == LM85_VERSTEP_GENERIC ) {\n" "+\t\t\tprintk(\"lm85: Unrecgonized version/stepping 0x%02x\"\n" "+\t\t\t \" Defaulting to ADM1027.\\n\", verstep );\n" "+\t\t\tkind = adm1027 ;\n" - "+\t\t} else if( kind = 0 && (verstep & 0xf0) = 0x60) {\n" + "+\t\t} else if( kind == 0 && (verstep & 0xf0) == 0x60) {\n" "+\t\t\tprintk(\"lm85: Generic LM85 Version 6 detected\\n\");\n" "+\t\t\t/* Leave kind as \"any_chip\" */\n" "+\t\t} else {\n" @@ -901,7 +900,7 @@ "+\t\t\t\tprintk(\"lm85: Autodetection failed\\n\");\n" "+\t\t\t}\n" "+\t\t\t/* Not an LM85 ... */\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 printk(\"lm85: Generic LM85 Version 6 not\"\n" "+\t\t\t\t\" found at %d,0x%02x. Try force_lm85c.\\n\",\n" "+\t\t\t\ti2c_adapter_id(adapter), address );\n" @@ -912,19 +911,19 @@ "+\t}\n" "+\n" "+\t/* Fill in the chip specific driver values */\n" - "+\tif ( kind = any_chip ) {\n" + "+\tif ( kind == any_chip ) {\n" "+\t\ttype_name = \"lm85\";\n" "+\t\tstrlcpy(new_client->dev.name, \"Generic LM85\", DEVICE_NAME_SIZE);\n" - "+\t} else if ( kind = lm85b ) {\n" + "+\t} else if ( kind == lm85b ) {\n" "+\t\ttype_name = \"lm85b\";\n" "+\t\tstrlcpy(new_client->dev.name, \"National LM85-B\", DEVICE_NAME_SIZE);\n" - "+\t} else if ( kind = lm85c ) {\n" + "+\t} else if ( kind == lm85c ) {\n" "+\t\ttype_name = \"lm85c\";\n" "+\t\tstrlcpy(new_client->dev.name, \"National LM85-C\", DEVICE_NAME_SIZE);\n" - "+\t} else if ( kind = adm1027 ) {\n" + "+\t} else if ( kind == adm1027 ) {\n" "+\t\ttype_name = \"adm1027\";\n" "+\t\tstrlcpy(new_client->dev.name, \"Analog Devices ADM1027\", DEVICE_NAME_SIZE);\n" - "+\t} else if ( kind = adt7463 ) {\n" + "+\t} else if ( kind == adt7463 ) {\n" "+\t\ttype_name = \"adt7463\";\n" "+\t\tstrlcpy(new_client->dev.name, \"Analog Devices ADT7463\", DEVICE_NAME_SIZE);\n" "+\t} else {\n" @@ -1099,8 +1098,8 @@ "+\t\t\t i2c_adapter_id(client->adapter), client->addr );\n" "+\t};\n" "+\tif( value & 0x10\n" - "+\t && ( data->type = adm1027\n" - "+\t\t|| data->type = adt7463 ) ) {\n" + "+\t && ( data->type == adm1027\n" + "+\t\t|| data->type == adt7463 ) ) {\n" "+\t\tprintk(\"lm85(%d): Client (%d,0x%02x) VxI mode is set. \"\n" "+\t\t\t\"Please report this to the lm85 maintainer.\\n\",\n" "+\t\t\t client->id,\n" @@ -1143,29 +1142,35 @@ "+\t\t/* Have to read extended bits first to \"freeze\" the\n" "+\t\t * more significant bits that are read later.\n" "+\t\t */\n" - "+\t\tif ( (data->type = adm1027) || (data->type = adt7463) ) {\n" - "+\t\t\tdata->extend_adc +\t\t\t lm85_read_value(client, ADM1027_REG_EXTEND_ADC1);\n" + "+\t\tif ( (data->type == adm1027) || (data->type == adt7463) ) {\n" + "+\t\t\tdata->extend_adc =\n" + "+\t\t\t lm85_read_value(client, ADM1027_REG_EXTEND_ADC1);\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 4; ++i) {\n" - "+\t\t\tdata->in[i] +\t\t\t lm85_read_value(client, LM85_REG_IN(i));\n" + "+\t\t\tdata->in[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_IN(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 3; ++i) {\n" - "+\t\t\tdata->fan[i] +\t\t\t lm85_read_value(client, LM85_REG_FAN(i));\n" + "+\t\t\tdata->fan[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_FAN(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 2; ++i) {\n" - "+\t\t\tdata->temp[i] +\t\t\t lm85_read_value(client, LM85_REG_TEMP(i));\n" + "+\t\t\tdata->temp[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_TEMP(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 2; ++i) {\n" - "+\t\t\tdata->pwm[i] +\t\t\t lm85_read_value(client, LM85_REG_PWM(i));\n" + "+\t\t\tdata->pwm[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_PWM(i));\n" "+\t\t}\n" "+\n" - "+\t\tif ( data->type = adt7463 ) {\n" + "+\t\tif ( data->type == adt7463 ) {\n" "+\t\t\tif( data->therm_total < ULONG_MAX - 256 ) {\n" - "+\t\t\t data->therm_total ++\t\t\t\tlm85_read_value(client, ADT7463_REG_THERM );\n" + "+\t\t\t data->therm_total +=\n" + "+\t\t\t\tlm85_read_value(client, ADT7463_REG_THERM );\n" "+\t\t\t}\n" "+\t\t}\n" "+\n" @@ -1182,30 +1187,39 @@ "+\t\t\tprintk(\"lm85(%d): Reading config values\\n\", client->id);\n" "+\t\t}\n" "+\t\tfor (i = 0; i <= 4; ++i) {\n" - "+\t\t\tdata->in_min[i] +\t\t\t lm85_read_value(client, LM85_REG_IN_MIN(i));\n" - "+\t\t\tdata->in_max[i] +\t\t\t lm85_read_value(client, LM85_REG_IN_MAX(i));\n" + "+\t\t\tdata->in_min[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_IN_MIN(i));\n" + "+\t\t\tdata->in_max[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_IN_MAX(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 3; ++i) {\n" - "+\t\t\tdata->fan_min[i] +\t\t\t lm85_read_value(client, LM85_REG_FAN_MIN(i));\n" + "+\t\t\tdata->fan_min[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_FAN_MIN(i));\n" "+\t\t}\n" "+\n" "+\t\tfor (i = 0; i <= 2; ++i) {\n" - "+\t\t\tdata->temp_min[i] +\t\t\t lm85_read_value(client, LM85_REG_TEMP_MIN(i));\n" - "+\t\t\tdata->temp_max[i] +\t\t\t lm85_read_value(client, LM85_REG_TEMP_MAX(i));\n" + "+\t\t\tdata->temp_min[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_TEMP_MIN(i));\n" + "+\t\t\tdata->temp_max[i] =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_TEMP_MAX(i));\n" "+\t\t}\n" "+\n" "+\t\tdata->vid = lm85_read_value(client, LM85_REG_VID);\n" "+\n" "+\t\tfor (i = 0; i <= 2; ++i) {\n" "+\t\t\tint val ;\n" - "+\t\t\tdata->autofan[i].config +\t\t\t lm85_read_value(client, LM85_REG_AFAN_CONFIG(i));\n" + "+\t\t\tdata->autofan[i].config =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_AFAN_CONFIG(i));\n" "+\t\t\tval = lm85_read_value(client, LM85_REG_AFAN_RANGE(i));\n" "+\t\t\tdata->autofan[i].freq = val & 0x07 ;\n" "+\t\t\tdata->zone[i].range = (val >> 4) & 0x0f ;\n" - "+\t\t\tdata->autofan[i].min_pwm +\t\t\t lm85_read_value(client, LM85_REG_AFAN_MINPWM(i));\n" - "+\t\t\tdata->zone[i].limit +\t\t\t lm85_read_value(client, LM85_REG_AFAN_LIMIT(i));\n" - "+\t\t\tdata->zone[i].critical +\t\t\t lm85_read_value(client, LM85_REG_AFAN_CRITICAL(i));\n" + "+\t\t\tdata->autofan[i].min_pwm =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_AFAN_MINPWM(i));\n" + "+\t\t\tdata->zone[i].limit =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_AFAN_LIMIT(i));\n" + "+\t\t\tdata->zone[i].critical =\n" + "+\t\t\t lm85_read_value(client, LM85_REG_AFAN_CRITICAL(i));\n" "+\t\t}\n" "+\n" "+\t\ti = lm85_read_value(client, LM85_REG_AFAN_SPIKE1);\n" @@ -1225,13 +1239,13 @@ "+\t\ti = lm85_read_value(client, LM85_REG_AFAN_HYST2);\n" "+\t\tdata->zone[2].hyst = (i>>4) & 0x0f ;\n" "+\n" - "+\t\tif ( (data->type = lm85b) || (data->type = lm85c) ) {\n" + "+\t\tif ( (data->type == lm85b) || (data->type == lm85c) ) {\n" "+\t\t\tdata->tach_mode = lm85_read_value(client,\n" "+\t\t\t\tLM85_REG_TACH_MODE );\n" "+\t\t\tdata->spinup_ctl = lm85_read_value(client,\n" "+\t\t\t\tLM85_REG_SPINUP_CTL );\n" - "+\t\t} else if ( (data->type = adt7463) || (data->type = adm1027) ) {\n" - "+\t\t\tif ( data->type = adt7463 ) {\n" + "+\t\t} else if ( (data->type == adt7463) || (data->type == adm1027) ) {\n" + "+\t\t\tif ( data->type == adt7463 ) {\n" "+\t\t\t\tfor (i = 0; i <= 2; ++i) {\n" "+\t\t\t\t data->oppoint[i] = lm85_read_value(client,\n" "+\t\t\t\t\tADT7463_REG_OPPOINT(i) );\n" @@ -1283,4 +1297,4 @@ "+module_init(sm_lm85_init);\n" +module_exit(sm_lm85_exit); -abeda630cd617608cc633f12c9ec2aea81fa1ee80227f1f71c4cd5412de8dcc4 +3c25ca697ac5aaf4a61c674a1157ae6fd890c82bf7d2e229ee924ddfc71e52e7
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.