hwmon: (w83791d) Clean up detect function
Subsystems (2)
PATCH 1/1 hwmon: (w83791d) Clean up detect function
As kind is now hard-coded to -1, there is room for code clean-ups.
--- drivers/hwmon/w83791d.c | 60 ++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 42 deletions(-)
drivers/hwmon/w83791d.c +18 -42
@@ -1270,56 +1270,32 @@ static int w83791d_detect(struct i2c_clireturn -ENODEV ; } -/* The w83791d may be stuck in some other bank than bank 0. This may -make reading other information impossible. Specify a force=... -parameter, and the Winbond will be reset to the right bank. */ -if (kind <0 ) { -if (w83791d_read (client,W83791D_REG_CONFIG ) &0x80 ) { -return -ENODEV ; - } - val1 =w83791d_read (client,W83791D_REG_BANK ); - val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); -/* Check for Winbond ID if in bank 0 */ -if (!(val1 &0x07 )) { -/* yes it is Bank0 */ -if (((!(val1 &0x80 )) && (val2 !=0xa3 )) || - ((val1 &0x80 ) && (val2 !=0x5c ))) { -return -ENODEV ; - } - } -/* If Winbond chip, address of chip and W83791D_REG_I2C_ADDR -should match */ -if (w83791d_read (client,W83791D_REG_I2C_ADDR ) != address) { +if (w83791d_read (client,W83791D_REG_CONFIG ) &0x80 ) +return -ENODEV ; + + val1 =w83791d_read (client,W83791D_REG_BANK ); + val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); +/* Check for Winbond ID if in bank 0 */ +if (!(val1 &0x07 )) { +if ((!(val1 &0x80 ) && val2 !=0xa3 ) || + ( (val1 &0x80 ) && val2 !=0x5c )) {return -ENODEV ; } } +/* If Winbond chip, address of chip and W83791D_REG_I2C_ADDR +should match */ +if (w83791d_read (client,W83791D_REG_I2C_ADDR ) != address) +return -ENODEV ; -/* We either have a force parameter or we have reason to -believe it is a Winbond chip. Either way, we want bank 0 and -Vendor ID high byte */ +/* We want bank 0 and Vendor ID high byte */ val1 =w83791d_read (client,W83791D_REG_BANK ) &0x78 ;w83791d_write (client,W83791D_REG_BANK , val1 |0x80 );/* Verify it is a Winbond w83791d */ -if (kind <=0 ) { -/* get vendor ID */ - val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); -if (val2 !=0x5c ) {/* the vendor is NOT Winbond */ -return -ENODEV ; - } - val1 =w83791d_read (client,W83791D_REG_WCHIPID ); -if (val1 =0x71 ) { - kind = w83791d; - }else { -if (kind =0 ) -dev_warn (&adapter->dev, -"w83791d: Ignoring 'force' parameter " -"for unknown chip at adapter %d, " -"address 0x%02x\n" , -i2c_adapter_id (adapter), address); -return -ENODEV ; - } - } + val1 =w83791d_read (client,W83791D_REG_WCHIPID ); + val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); +if (val1 !=0x71 || val2 !=0x5c ) +return -ENODEV ;strlcpy (info->type,"w83791d" ,I2C_NAME_SIZE );
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Jean,
Quoted 5 lines · On Tuesday 06 October 2009 20:11:01 Jean Delvare wrote:
As kind is now hard-coded to -1, there is room for code clean-ups.
Signed-off-by Jean Delvare <[email protected]>Cc Marc Hulsman <[email protected]>---
Looks good,
Thanks,
Marc
Quoted 71 lines
drivers/hwmon/w83791d.c | 60++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 42 deletions(-)
---
linux-2.6.32-rc3.orig/drivers/hwmon/w83791d.c2009-10-06
10:33:15.000000000 +0200 +++linux-2.6.32-rc3/drivers/hwmon/w83791d.c2009-10-06 12:13:28.000000000
+0200 @@ -1270,56 +1270,32 @@ static int w83791d_detect(structi2c_clidrivers/hwmon/w83791d.c +14
-38return -ENODEV ; } -/* The w83791d may be stuck in some other bank than bank 0. This may -make reading other information impossible. Specify a force=... -parameter, and the Winbond will be reset to the right bank. */ -if (kind <0 ) { -if (w83791d_read (client,W83791D_REG_CONFIG ) &0x80 ) { -return -ENODEV ; - } - val1 =w83791d_read (client,W83791D_REG_BANK ); - val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); -/* Check for Winbond ID if in bank 0 */ -if (!(val1 &0x07 )) { -/* yes it is Bank0 */ -if (((!(val1 &0x80 )) && (val2 !=0xa3 )) || - ((val1 &0x80 ) && (val2 !=0x5c ))) { -return -ENODEV ; - } - } -/* If Winbond chip, address of chip and W83791D_REG_I2C_ADDR -should match */ -if (w83791d_read (client,W83791D_REG_I2C_ADDR ) != address) { +if (w83791d_read (client,W83791D_REG_CONFIG ) &0x80 ) +return -ENODEV ; + + val1 =w83791d_read (client,W83791D_REG_BANK ); + val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); +/* Check for Winbond ID if in bank 0 */ +if (!(val1 &0x07 )) { +if ((!(val1 &0x80 ) && val2 !=0xa3 ) || + ( (val1 &0x80 ) && val2 !=0x5c )) {return -ENODEV ; } } +/* If Winbond chip, address of chip and W83791D_REG_I2C_ADDR +should match */ +if (w83791d_read (client,W83791D_REG_I2C_ADDR ) != address) +return -ENODEV ; -/* We either have a force parameter or we have reason to -believe it is a Winbond chip. Either way, we want bank 0 and -Vendor ID high byte */ +/* We want bank 0 and Vendor ID high byte */ val1 =w83791d_read (client,W83791D_REG_BANK ) &0x78 ;w83791d_write (client,W83791D_REG_BANK , val1 |0x80 );/* Verify it is a Winbond w83791d */ -if (kind <=0 ) { -/* get vendor ID */ - val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); -if (val2 !=0x5c ) {/* the vendor is NOT Winbond */ -return -ENODEV ; - } - val1 =w83791d_read (client,W83791D_REG_WCHIPID ); -if (val1 =0x71 ) { - kind = w83791d; - }else { -if (kind =0 ) - dev_warn(&adapter->dev, - "w83791d: Ignoring 'force' parameter " - "for unknown chip at adapter %d, " - "address 0x%02x\n",
drivers/hwmon/w83791d.c static int w83791d_detect(struct i2c_cli · line 1300
Quoted 10 lines
drivers/hwmon/w83791d.c +4
-4- i2c_adapter_id(adapter), address); -return -ENODEV ; - } - } + val1 =w83791d_read (client,W83791D_REG_WCHIPID ); + val2 =w83791d_read (client,W83791D_REG_CHIPMAN ); +if (val1 !=0x71 || val2 !=0x5c ) +return -ENODEV ;strlcpy (info->type,"w83791d" ,I2C_NAME_SIZE );
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Marc,
Quoted 11 lines · Marc Hulsman
Hi Jean,
Quoted 5 lines · On Tuesday 06 October 2009 20:11:01 Jean Delvare wrote:
As kind is now hard-coded to -1, there is room for code clean-ups.
Signed-off-by Jean Delvare <[email protected]>Cc Marc Hulsman <[email protected]>---
Looks good,
Acked-by Marc Hulsman <[email protected]>
Thanks. Can you please also test it? Just to make sure I didn't mess it up.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Marc Hulsman
maintainerHi Jean,
Quoted 6 lines · On Friday 09 October 2009 10:49:03 Jean Delvare wrote:
Quoted 6 lines
Quoted 5 lines
As kind is now hard-coded to -1, there is room for code clean-ups.
Signed-off-by Jean Delvare <[email protected]>Cc Marc Hulsman <[email protected]>---
Quoted 6 lines
Quoted 3 lines
Looks good,
Acked-by Marc Hulsman <[email protected]>Thanks. Can you please also test it? Just to make sure I didn't mess it up.
Unfortunately, I do not have access to the w83791d right now (maybe in two weeks). However, I did check the patch quite thoroughly, so I'm reasonably sure its ok.
Best regards,
Marc
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors