diff for duplicates of <20050206202641.GA31771@bode.aurel32.net> diff --git a/a/1.txt b/N1/1.txt index ed79069..092d54d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,7 +57,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + for hardware monitoring + + Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, -+ Ky?sti M?lkki <kmalkki@cc.hut.fi>, and ++ Kyösti Mälkki <kmalkki@cc.hut.fi>, and + Mark D. Studebaker <mdsxyz123@yahoo.com> + Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with + the help of Jean Delvare <khali@linux-fr.org> @@ -192,7 +192,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + +static inline int FAN_FROM_REG(u8 val, int div) +{ -+ return val=0 ? -1 : val=255 ? 0 : 1350000/(val*div); ++ return val==0 ? -1 : val==255 ? 0 : 1350000/(val*div); +} + +/* TEMP: mC (-54.12C to +157.53C) @@ -211,7 +211,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + REG: 0, 1, 2, or 3 (respectively) (defaults to 1) */ +static inline u8 DIV_TO_REG(int val) +{ -+ return val=8 ? 3 : val=4 ? 2 : val=1 ? 0 : 1; ++ return val==8 ? 3 : val==4 ? 2 : val==1 ? 0 : 1; +} +#define DIV_FROM_REG(val) (1 << (val)) + @@ -226,7 +226,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + struct semaphore update_lock; + char valid; /* !=0 if following fields are valid */ + unsigned long last_updated; /* In jiffies */ -+ char maxins; /* = 3 if temp enabled, otherwise = 4 */ ++ char maxins; /* == 3 if temp enabled, otherwise == 4 */ + u8 revision; /* Reg. value */ + + u8 in[5]; /* Register value */ @@ -451,7 +451,8 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + break; + } + sis5595_write_value(client, SIS5595_REG_FANDIV, reg); -+ data->fan_min[nr] + FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); ++ data->fan_min[nr] = ++ FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr])); + sis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]); + return count; +} @@ -535,25 +536,30 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + } + if (force_addr) { + dev_warn(&adapter->dev, "forcing ISA address 0x%04X\n", address); -+ if (PCIBIOS_SUCCESSFUL !+ pci_write_config_word(s_bridge, SIS5595_BASE_REG, address)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_write_config_word(s_bridge, SIS5595_BASE_REG, address)) + goto exit_release; -+ if (PCIBIOS_SUCCESSFUL !+ pci_read_config_word(s_bridge, SIS5595_BASE_REG, &a)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_read_config_word(s_bridge, SIS5595_BASE_REG, &a)) + goto exit_release; + if ((a & ~(SIS5595_EXTENT - 1)) != address) + /* doesn't work for some chips? */ + goto exit_release; + } + -+ if (PCIBIOS_SUCCESSFUL !+ pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) { ++ if (PCIBIOS_SUCCESSFUL != ++ pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) { + goto exit_release; + } -+ if ((val & 0x80) = 0) { -+ if (PCIBIOS_SUCCESSFUL !+ pci_write_config_byte(s_bridge, SIS5595_ENABLE_REG, ++ if ((val & 0x80) == 0) { ++ if (PCIBIOS_SUCCESSFUL != ++ pci_write_config_byte(s_bridge, SIS5595_ENABLE_REG, + val | 0x80)) + goto exit_release; -+ if (PCIBIOS_SUCCESSFUL !+ pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) + goto exit_release; -+ if ((val & 0x80) = 0) ++ if ((val & 0x80) == 0) + /* doesn't work for some chips! */ + goto exit_release; + } @@ -615,7 +621,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + device_create_file(&new_client->dev, &dev_attr_in3_input); + device_create_file(&new_client->dev, &dev_attr_in3_min); + device_create_file(&new_client->dev, &dev_attr_in3_max); -+ if (data->maxins = 4) { ++ if (data->maxins == 4) { + device_create_file(&new_client->dev, &dev_attr_in4_input); + device_create_file(&new_client->dev, &dev_attr_in4_min); + device_create_file(&new_client->dev, &dev_attr_in4_max); @@ -627,7 +633,7 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + device_create_file(&new_client->dev, &dev_attr_fan2_min); + device_create_file(&new_client->dev, &dev_attr_fan2_div); + device_create_file(&new_client->dev, &dev_attr_alarms); -+ if (data->maxins = 3) { ++ if (data->maxins == 3) { + device_create_file(&new_client->dev, &dev_attr_temp1_input); + device_create_file(&new_client->dev, &dev_attr_temp1_max); + device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst); @@ -705,26 +711,35 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + || !data->valid) { + + for (i = 0; i <= data->maxins; i++) { -+ data->in[i] + sis5595_read_value(client, SIS5595_REG_IN(i)); -+ data->in_min[i] + sis5595_read_value(client, ++ data->in[i] = ++ sis5595_read_value(client, SIS5595_REG_IN(i)); ++ data->in_min[i] = ++ sis5595_read_value(client, + SIS5595_REG_IN_MIN(i)); -+ data->in_max[i] + sis5595_read_value(client, ++ data->in_max[i] = ++ sis5595_read_value(client, + SIS5595_REG_IN_MAX(i)); + } + for (i = 0; i < 2; i++) { -+ data->fan[i] + sis5595_read_value(client, SIS5595_REG_FAN(i)); -+ data->fan_min[i] + sis5595_read_value(client, ++ data->fan[i] = ++ sis5595_read_value(client, SIS5595_REG_FAN(i)); ++ data->fan_min[i] = ++ sis5595_read_value(client, + SIS5595_REG_FAN_MIN(i)); + } -+ if (data->maxins = 3) { -+ data->temp + sis5595_read_value(client, SIS5595_REG_TEMP); -+ data->temp_over + sis5595_read_value(client, SIS5595_REG_TEMP_OVER); -+ data->temp_hyst + sis5595_read_value(client, SIS5595_REG_TEMP_HYST); ++ if (data->maxins == 3) { ++ data->temp = ++ sis5595_read_value(client, SIS5595_REG_TEMP); ++ data->temp_over = ++ sis5595_read_value(client, SIS5595_REG_TEMP_OVER); ++ data->temp_hyst = ++ sis5595_read_value(client, SIS5595_REG_TEMP_HYST); + } + i = sis5595_read_value(client, SIS5595_REG_FANDIV); + data->fan_div[0] = (i >> 4) & 0x03; + data->fan_div[1] = i >> 6; -+ data->alarms + sis5595_read_value(client, SIS5595_REG_ALARM1) | ++ data->alarms = ++ sis5595_read_value(client, SIS5595_REG_ALARM1) | + (sis5595_read_value(client, SIS5595_REG_ALARM2) << 8); + data->last_updated = jiffies; + data->valid = 1; @@ -773,11 +788,12 @@ diff -urN linux-2.6.11-rc3-mm1.orig/drivers/i2c/chips/sis5595.c linux-2.6.11-rc3 + } + } + -+ if (PCIBIOS_SUCCESSFUL !+ pci_read_config_word(dev, SIS5595_BASE_REG, &val)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_read_config_word(dev, SIS5595_BASE_REG, &val)) + return -ENODEV; + + addr = val & ~(SIS5595_EXTENT - 1); -+ if (addr = 0 && force_addr = 0) { ++ if (addr == 0 && force_addr == 0) { + dev_err(&dev->dev, "Base address not set - upgrade BIOS or use force_addr=0xaddr\n"); + return -ENODEV; + } diff --git a/a/content_digest b/N1/content_digest index 244653a..72aaf57 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020050125220945.GA23560@bode.aurel32.net\0" - "From\0aurelien@aurel32.net (Aur\303\251lien Jarno)\0" + "From\0Aur\303\251lien Jarno <aurelien@aurel32.net>\0" "Subject\0[PATCH 2.6] I2C: New chip driver: sis5595 (resubmit)\0" - "Date\0Thu, 19 May 2005 06:25:36 +0000\0" + "Date\0Sun, 6 Feb 2005 21:26:41 +0100\0" "To\0Greg KH <greg@kroah.com>\0" "Cc\0sensors@stimpy.netroedge.com" " linux-kernel@vger.kernel.org\0" @@ -66,7 +65,7 @@ "+\t\tfor hardware monitoring\n" "+\n" "+ Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,\n" - "+\t\t\tKy?sti M?lkki <kmalkki@cc.hut.fi>, and\n" + "+\t\t\tKy\303\266sti M\303\244lkki <kmalkki@cc.hut.fi>, and\n" "+\t\t\tMark D. Studebaker <mdsxyz123@yahoo.com>\n" "+ Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with\n" "+ the help of Jean Delvare <khali@linux-fr.org>\n" @@ -201,7 +200,7 @@ "+\n" "+static inline int FAN_FROM_REG(u8 val, int div)\n" "+{\n" - "+\treturn val=0 ? -1 : val=255 ? 0 : 1350000/(val*div);\n" + "+\treturn val==0 ? -1 : val==255 ? 0 : 1350000/(val*div);\n" "+}\n" "+\n" "+/* TEMP: mC (-54.12C to +157.53C)\n" @@ -220,7 +219,7 @@ "+ REG: 0, 1, 2, or 3 (respectively) (defaults to 1) */\n" "+static inline u8 DIV_TO_REG(int val)\n" "+{\n" - "+\treturn val=8 ? 3 : val=4 ? 2 : val=1 ? 0 : 1;\n" + "+\treturn val==8 ? 3 : val==4 ? 2 : val==1 ? 0 : 1;\n" "+}\n" "+#define DIV_FROM_REG(val) (1 << (val))\n" "+\n" @@ -235,7 +234,7 @@ "+\tstruct semaphore update_lock;\n" "+\tchar valid;\t\t/* !=0 if following fields are valid */\n" "+\tunsigned long last_updated;\t/* In jiffies */\n" - "+\tchar maxins;\t\t/* = 3 if temp enabled, otherwise = 4 */\n" + "+\tchar maxins;\t\t/* == 3 if temp enabled, otherwise == 4 */\n" "+\tu8 revision;\t\t/* Reg. value */\n" "+\n" "+\tu8 in[5];\t\t/* Register value */\n" @@ -460,7 +459,8 @@ "+\t\tbreak;\n" "+\t}\n" "+\tsis5595_write_value(client, SIS5595_REG_FANDIV, reg);\n" - "+\tdata->fan_min[nr] +\t\tFAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));\n" + "+\tdata->fan_min[nr] =\n" + "+\t\tFAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));\n" "+\tsis5595_write_value(client, SIS5595_REG_FAN_MIN(nr), data->fan_min[nr]);\n" "+\treturn count;\n" "+}\n" @@ -544,25 +544,30 @@ "+\t}\n" "+\tif (force_addr) {\n" "+\t\tdev_warn(&adapter->dev, \"forcing ISA address 0x%04X\\n\", address);\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_write_config_word(s_bridge, SIS5595_BASE_REG, address))\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_write_config_word(s_bridge, SIS5595_BASE_REG, address))\n" "+\t\t\tgoto exit_release;\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_read_config_word(s_bridge, SIS5595_BASE_REG, &a))\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_read_config_word(s_bridge, SIS5595_BASE_REG, &a))\n" "+\t\t\tgoto exit_release;\n" "+\t\tif ((a & ~(SIS5595_EXTENT - 1)) != address)\n" "+\t\t\t/* doesn't work for some chips? */\n" "+\t\t\tgoto exit_release;\n" "+\t}\n" "+\n" - "+\tif (PCIBIOS_SUCCESSFUL !+\t pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) {\n" + "+\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val)) {\n" "+\t\tgoto exit_release;\n" "+\t}\n" - "+\tif ((val & 0x80) = 0) {\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_write_config_byte(s_bridge, SIS5595_ENABLE_REG,\n" + "+\tif ((val & 0x80) == 0) {\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_write_config_byte(s_bridge, SIS5595_ENABLE_REG,\n" "+\t\t\t\t\t val | 0x80))\n" "+\t\t\tgoto exit_release;\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val))\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &val))\n" "+\t\t\tgoto exit_release;\n" - "+\t\tif ((val & 0x80) = 0) \n" + "+\t\tif ((val & 0x80) == 0) \n" "+\t\t\t/* doesn't work for some chips! */\n" "+\t\t\tgoto exit_release;\n" "+\t}\n" @@ -624,7 +629,7 @@ "+\tdevice_create_file(&new_client->dev, &dev_attr_in3_input);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_in3_min);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_in3_max);\n" - "+\tif (data->maxins = 4) {\n" + "+\tif (data->maxins == 4) {\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_in4_input);\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_in4_min);\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_in4_max);\n" @@ -636,7 +641,7 @@ "+\tdevice_create_file(&new_client->dev, &dev_attr_fan2_min);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_fan2_div);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_alarms);\n" - "+\tif (data->maxins = 3) {\n" + "+\tif (data->maxins == 3) {\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_temp1_input);\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_temp1_max);\n" "+\t\tdevice_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);\n" @@ -714,26 +719,35 @@ "+\t || !data->valid) {\n" "+\n" "+\t\tfor (i = 0; i <= data->maxins; i++) {\n" - "+\t\t\tdata->in[i] +\t\t\t sis5595_read_value(client, SIS5595_REG_IN(i));\n" - "+\t\t\tdata->in_min[i] +\t\t\t sis5595_read_value(client,\n" + "+\t\t\tdata->in[i] =\n" + "+\t\t\t sis5595_read_value(client, SIS5595_REG_IN(i));\n" + "+\t\t\tdata->in_min[i] =\n" + "+\t\t\t sis5595_read_value(client,\n" "+\t\t\t\t\t SIS5595_REG_IN_MIN(i));\n" - "+\t\t\tdata->in_max[i] +\t\t\t sis5595_read_value(client,\n" + "+\t\t\tdata->in_max[i] =\n" + "+\t\t\t sis5595_read_value(client,\n" "+\t\t\t\t\t SIS5595_REG_IN_MAX(i));\n" "+\t\t}\n" "+\t\tfor (i = 0; i < 2; i++) {\n" - "+\t\t\tdata->fan[i] +\t\t\t sis5595_read_value(client, SIS5595_REG_FAN(i));\n" - "+\t\t\tdata->fan_min[i] +\t\t\t sis5595_read_value(client,\n" + "+\t\t\tdata->fan[i] =\n" + "+\t\t\t sis5595_read_value(client, SIS5595_REG_FAN(i));\n" + "+\t\t\tdata->fan_min[i] =\n" + "+\t\t\t sis5595_read_value(client,\n" "+\t\t\t\t\t SIS5595_REG_FAN_MIN(i));\n" "+\t\t}\n" - "+\t\tif (data->maxins = 3) {\n" - "+\t\t\tdata->temp +\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP);\n" - "+\t\t\tdata->temp_over +\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP_OVER);\n" - "+\t\t\tdata->temp_hyst +\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP_HYST);\n" + "+\t\tif (data->maxins == 3) {\n" + "+\t\t\tdata->temp =\n" + "+\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP);\n" + "+\t\t\tdata->temp_over =\n" + "+\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP_OVER);\n" + "+\t\t\tdata->temp_hyst =\n" + "+\t\t\t sis5595_read_value(client, SIS5595_REG_TEMP_HYST);\n" "+\t\t}\n" "+\t\ti = sis5595_read_value(client, SIS5595_REG_FANDIV);\n" "+\t\tdata->fan_div[0] = (i >> 4) & 0x03;\n" "+\t\tdata->fan_div[1] = i >> 6;\n" - "+\t\tdata->alarms +\t\t sis5595_read_value(client, SIS5595_REG_ALARM1) |\n" + "+\t\tdata->alarms =\n" + "+\t\t sis5595_read_value(client, SIS5595_REG_ALARM1) |\n" "+\t\t (sis5595_read_value(client, SIS5595_REG_ALARM2) << 8);\n" "+\t\tdata->last_updated = jiffies;\n" "+\t\tdata->valid = 1;\n" @@ -782,11 +796,12 @@ "+\t\t}\n" "+\t}\n" "+\t\n" - "+\tif (PCIBIOS_SUCCESSFUL !+\t pci_read_config_word(dev, SIS5595_BASE_REG, &val))\n" + "+\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t pci_read_config_word(dev, SIS5595_BASE_REG, &val))\n" "+\t\treturn -ENODEV;\n" "+\t\n" "+\taddr = val & ~(SIS5595_EXTENT - 1);\n" - "+\tif (addr = 0 && force_addr = 0) {\n" + "+\tif (addr == 0 && force_addr == 0) {\n" "+\t\tdev_err(&dev->dev, \"Base address not set - upgrade BIOS or use force_addr=0xaddr\\n\");\n" "+\t\treturn -ENODEV;\n" "+\t}\n" @@ -848,4 +863,4 @@ " `. `' aurel32@debian.org | aurelien@aurel32.net\n" `- people.debian.org/~aurel32 | www.aurel32.net -52e6ead3d0f198742abdbd54675ac1af37017d6dfc8abe53a8663c72985c8f80 +8d03539a7f94365a29f32ded880cccdd4ffacbfef8262e43a70bac8b31881c6b
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.