aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/w83627hf4
-rw-r--r--drivers/hwmon/w83627hf.c27
2 files changed, 0 insertions, 31 deletions
diff --git a/Documentation/hwmon/w83627hf b/Documentation/hwmon/w83627hf
index 880a59f53da9..6ee36dbafd64 100644
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
@@ -40,10 +40,6 @@ Module Parameters
40 (default is 1) 40 (default is 1)
41 Use 'init=0' to bypass initializing the chip. 41 Use 'init=0' to bypass initializing the chip.
42 Try this if your computer crashes when you load the module. 42 Try this if your computer crashes when you load the module.
43* reset: int
44 (default is 0)
45 The driver used to reset the chip on load, but does no more. Use
46 'reset=1' to restore the old behavior. Report if you need to do this.
47 43
48Description 44Description
49----------- 45-----------
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index ba8b069b1082..b30e5796cb26 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -67,10 +67,6 @@ module_param(force_i2c, byte, 0);
67MODULE_PARM_DESC(force_i2c, 67MODULE_PARM_DESC(force_i2c,
68 "Initialize the i2c address of the sensors"); 68 "Initialize the i2c address of the sensors");
69 69
70static int reset;
71module_param(reset, bool, 0);
72MODULE_PARM_DESC(reset, "Set to one to reset chip on load");
73
74static int init = 1; 70static int init = 1;
75module_param(init, bool, 0); 71module_param(init, bool, 0);
76MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization"); 72MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
@@ -1600,29 +1596,6 @@ static void __devinit w83627hf_init_device(struct platform_device *pdev)
1600 enum chips type = data->type; 1596 enum chips type = data->type;
1601 u8 tmp; 1597 u8 tmp;
1602 1598
1603 if (reset) {
1604 /* Resetting the chip has been the default for a long time,
1605 but repeatedly caused problems (fans going to full
1606 speed...) so it is now optional. It might even go away if
1607 nobody reports it as being useful, as I see very little
1608 reason why this would be needed at all. */
1609 dev_info(&pdev->dev, "If reset=1 solved a problem you were "
1610 "having, please report!\n");
1611
1612 /* save this register */
1613 i = w83627hf_read_value(data, W83781D_REG_BEEP_CONFIG);
1614 /* Reset all except Watchdog values and last conversion values
1615 This sets fan-divs to 2, among others */
1616 w83627hf_write_value(data, W83781D_REG_CONFIG, 0x80);
1617 /* Restore the register and disable power-on abnormal beep.
1618 This saves FAN 1/2/3 input/output values set by BIOS. */
1619 w83627hf_write_value(data, W83781D_REG_BEEP_CONFIG, i | 0x80);
1620 /* Disable master beep-enable (reset turns it on).
1621 Individual beeps should be reset to off but for some reason
1622 disabling this bit helps some people not get beeped */
1623 w83627hf_write_value(data, W83781D_REG_BEEP_INTS2, 0);
1624 }
1625
1626 /* Minimize conflicts with other winbond i2c-only clients... */ 1599 /* Minimize conflicts with other winbond i2c-only clients... */
1627 /* disable i2c subclients... how to disable main i2c client?? */ 1600 /* disable i2c subclients... how to disable main i2c client?? */
1628 /* force i2c address to relatively uncommon address */ 1601 /* force i2c address to relatively uncommon address */