diff for duplicates of <10763687753019@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 5776219..43a636b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -153,12 +153,12 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c +static inline u8 FAN_TO_REG(long rpm, int div) +{ + long rpmdiv; -+ if (rpm = 0) ++ if (rpm == 0) + return 0; + rpmdiv = SENSORS_LIMIT(rpm, 1, 1920000) * div; + return SENSORS_LIMIT((960000 + rpmdiv / 2) / rpmdiv, 1, 255); +} -+#define FAN_FROM_REG(val,div) ((val)=0 ? 0 : (960000/((val)*(div)))) ++#define FAN_FROM_REG(val,div) ((val)==0 ? 0 : (960000/((val)*(div)))) + +#define IN_TO_REG(val) (SENSORS_LIMIT((((val)+9)/19),0,255)) +#define IN_FROM_REG(val) ((val)*19) @@ -166,7 +166,7 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c +#define VDD_TO_REG(val) (SENSORS_LIMIT((((val)*4+47)/95),0,255)) +#define VDD_FROM_REG(val) (((val)*95+2)/4) + -+#define DIV_TO_REG(val) ((val)=4?2:(val)=2?1:(val)=1?0:3) ++#define DIV_TO_REG(val) ((val)==4?2:(val)==2?1:(val)==1?0:3) +#define DIV_FROM_REG(val) (1 << (val)) + +#define BEEP_MASK_TO_REG(val) ((val) & 0x7f & data->alarm_mask) @@ -327,7 +327,7 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + gl518_write_value(client, GL518_REG_FAN_LIMIT, regvalue); + + data->beep_mask = gl518_read_value(client, GL518_REG_ALARM); -+ if (data->fan_min[0] = 0) ++ if (data->fan_min[0] == 0) + data->alarm_mask &= ~0x20; + else + data->alarm_mask |= 0x20; @@ -349,7 +349,7 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + gl518_write_value(client, GL518_REG_FAN_LIMIT, regvalue); + + data->beep_mask = gl518_read_value(client, GL518_REG_ALARM); -+ if (data->fan_min[1] = 0) ++ if (data->fan_min[1] == 0) + data->alarm_mask &= ~0x40; + else + data->alarm_mask |= 0x40; @@ -443,10 +443,10 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + /* Determine the chip type. */ + if (kind <= 0) { + i = gl518_read_value(new_client, GL518_REG_REVISION); -+ if (i = 0x00) { ++ if (i == 0x00) { + kind = gl518sm_r00; + name = "gl518sm"; -+ } else if (i = 0x80) { ++ } else if (i == 0x80) { + kind = gl518sm_r80; + name = "gl518sm"; + } else { @@ -472,7 +472,7 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + + /* Initialize the GL518SM chip */ + data->alarm_mask = 0xff; -+ data->voltage_in[0]Úta->voltage_in[1]Úta->voltage_in[2]=0; ++ data->voltage_in[0]=data->voltage_in[1]=data->voltage_in[2]=0; + gl518_init_client((struct i2c_client *) new_client); + + /* Register sysfs hooks */ @@ -611,8 +611,10 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + data->fan_min[1] = val & 0xff; + + data->temp_in = gl518_read_value(client, GL518_REG_TEMP_IN); -+ data->temp_max + gl518_read_value(client, GL518_REG_TEMP_MAX); -+ data->temp_hyst + gl518_read_value(client, GL518_REG_TEMP_HYST); ++ data->temp_max = ++ gl518_read_value(client, GL518_REG_TEMP_MAX); ++ data->temp_hyst = ++ gl518_read_value(client, GL518_REG_TEMP_HYST); + + val = gl518_read_value(client, GL518_REG_MISC); + data->fan_div[0] = (val >> 6) & 0x03; @@ -625,11 +627,15 @@ diff -Nru a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c + data->beep_enable = (val >> 2) & 1; + + if (data->type != gl518sm_r00) { -+ data->voltage_in[0] + gl518_read_value(client, GL518_REG_VDD); -+ data->voltage_in[1] + gl518_read_value(client, GL518_REG_VIN1); -+ data->voltage_in[2] + gl518_read_value(client, GL518_REG_VIN2); ++ data->voltage_in[0] = ++ gl518_read_value(client, GL518_REG_VDD); ++ data->voltage_in[1] = ++ gl518_read_value(client, GL518_REG_VIN1); ++ data->voltage_in[2] = ++ gl518_read_value(client, GL518_REG_VIN2); + } -+ data->voltage_in[3] + gl518_read_value(client, GL518_REG_VIN3); ++ data->voltage_in[3] = ++ gl518_read_value(client, GL518_REG_VIN3); + + data->last_updated = jiffies; + data->valid = 1; diff --git a/a/content_digest b/N1/content_digest index 28db937..4999c4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01076368775888@kroah.com\0" - "ref\010763687741938@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.3-rc1\0" - "Date\0Thu, 19 May 2005 06:24:41 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.3-rc1\0" + "Date\0Mon, 9 Feb 2004 15:19:35 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -162,12 +161,12 @@ "+static inline u8 FAN_TO_REG(long rpm, int div)\n" "+{\n" "+\tlong rpmdiv;\n" - "+\tif (rpm = 0)\n" + "+\tif (rpm == 0)\n" "+\t\treturn 0;\n" "+\trpmdiv = SENSORS_LIMIT(rpm, 1, 1920000) * div;\n" "+\treturn SENSORS_LIMIT((960000 + rpmdiv / 2) / rpmdiv, 1, 255);\n" "+}\n" - "+#define FAN_FROM_REG(val,div)\t((val)=0 ? 0 : (960000/((val)*(div))))\n" + "+#define FAN_FROM_REG(val,div)\t((val)==0 ? 0 : (960000/((val)*(div))))\n" "+\n" "+#define IN_TO_REG(val)\t\t(SENSORS_LIMIT((((val)+9)/19),0,255))\n" "+#define IN_FROM_REG(val)\t((val)*19)\n" @@ -175,7 +174,7 @@ "+#define VDD_TO_REG(val)\t\t(SENSORS_LIMIT((((val)*4+47)/95),0,255))\n" "+#define VDD_FROM_REG(val)\t(((val)*95+2)/4)\n" "+\n" - "+#define DIV_TO_REG(val)\t\t((val)=4?2:(val)=2?1:(val)=1?0:3)\n" + "+#define DIV_TO_REG(val)\t\t((val)==4?2:(val)==2?1:(val)==1?0:3)\n" "+#define DIV_FROM_REG(val)\t(1 << (val))\n" "+\n" "+#define BEEP_MASK_TO_REG(val)\t((val) & 0x7f & data->alarm_mask)\n" @@ -336,7 +335,7 @@ "+\tgl518_write_value(client, GL518_REG_FAN_LIMIT, regvalue);\n" "+\n" "+\tdata->beep_mask = gl518_read_value(client, GL518_REG_ALARM);\n" - "+\tif (data->fan_min[0] = 0)\n" + "+\tif (data->fan_min[0] == 0)\n" "+\t\tdata->alarm_mask &= ~0x20;\n" "+\telse\n" "+\t\tdata->alarm_mask |= 0x20;\n" @@ -358,7 +357,7 @@ "+\tgl518_write_value(client, GL518_REG_FAN_LIMIT, regvalue);\n" "+\n" "+\tdata->beep_mask = gl518_read_value(client, GL518_REG_ALARM);\n" - "+\tif (data->fan_min[1] = 0)\n" + "+\tif (data->fan_min[1] == 0)\n" "+\t\tdata->alarm_mask &= ~0x40;\n" "+\telse\n" "+\t\tdata->alarm_mask |= 0x40;\n" @@ -452,10 +451,10 @@ "+\t/* Determine the chip type. */\n" "+\tif (kind <= 0) {\n" "+\t\ti = gl518_read_value(new_client, GL518_REG_REVISION);\n" - "+\t\tif (i = 0x00) {\n" + "+\t\tif (i == 0x00) {\n" "+\t\t\tkind = gl518sm_r00;\n" "+\t\t\tname = \"gl518sm\";\n" - "+\t\t} else if (i = 0x80) {\n" + "+\t\t} else if (i == 0x80) {\n" "+\t\t\tkind = gl518sm_r80;\n" "+\t\t\tname = \"gl518sm\";\n" "+\t\t} else {\n" @@ -481,7 +480,7 @@ "+\n" "+\t/* Initialize the GL518SM chip */\n" "+\tdata->alarm_mask = 0xff;\n" - "+\tdata->voltage_in[0]\303\232ta->voltage_in[1]\303\232ta->voltage_in[2]=0;\n" + "+\tdata->voltage_in[0]=data->voltage_in[1]=data->voltage_in[2]=0;\n" "+\tgl518_init_client((struct i2c_client *) new_client);\n" "+\n" "+\t/* Register sysfs hooks */\n" @@ -620,8 +619,10 @@ "+\t\tdata->fan_min[1] = val & 0xff;\n" "+\n" "+\t\tdata->temp_in = gl518_read_value(client, GL518_REG_TEMP_IN);\n" - "+\t\tdata->temp_max +\t\t gl518_read_value(client, GL518_REG_TEMP_MAX);\n" - "+\t\tdata->temp_hyst +\t\t gl518_read_value(client, GL518_REG_TEMP_HYST);\n" + "+\t\tdata->temp_max =\n" + "+\t\t gl518_read_value(client, GL518_REG_TEMP_MAX);\n" + "+\t\tdata->temp_hyst =\n" + "+\t\t gl518_read_value(client, GL518_REG_TEMP_HYST);\n" "+\n" "+\t\tval = gl518_read_value(client, GL518_REG_MISC);\n" "+\t\tdata->fan_div[0] = (val >> 6) & 0x03;\n" @@ -634,11 +635,15 @@ "+\t\tdata->beep_enable = (val >> 2) & 1;\n" "+\n" "+\t\tif (data->type != gl518sm_r00) {\n" - "+\t\t\tdata->voltage_in[0] +\t\t\t gl518_read_value(client, GL518_REG_VDD);\n" - "+\t\t\tdata->voltage_in[1] +\t\t\t gl518_read_value(client, GL518_REG_VIN1);\n" - "+\t\t\tdata->voltage_in[2] +\t\t\t gl518_read_value(client, GL518_REG_VIN2);\n" + "+\t\t\tdata->voltage_in[0] =\n" + "+\t\t\t gl518_read_value(client, GL518_REG_VDD);\n" + "+\t\t\tdata->voltage_in[1] =\n" + "+\t\t\t gl518_read_value(client, GL518_REG_VIN1);\n" + "+\t\t\tdata->voltage_in[2] =\n" + "+\t\t\t gl518_read_value(client, GL518_REG_VIN2);\n" "+\t\t}\n" - "+\t\tdata->voltage_in[3] +\t\t gl518_read_value(client, GL518_REG_VIN3);\n" + "+\t\tdata->voltage_in[3] =\n" + "+\t\t gl518_read_value(client, GL518_REG_VIN3);\n" "+\n" "+\t\tdata->last_updated = jiffies;\n" "+\t\tdata->valid = 1;\n" @@ -666,4 +671,4 @@ "+module_init(sensors_gl518sm_init);\n" +module_exit(sensors_gl518sm_exit); -c0e5a8810e99c8f4b7124307851ccc3a288090975a17763aeb9ec676cace56cd +a32ad1522ff66a41aa475ce93905194c05a76c823aa095682e878f6db6ed8716
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.