hwmon: (tmp401/tmp421) Clean up detect
PATCH 1/1 hwmon: (tmp401/tmp421) Clean up detect
As kind is now hard-coded to -1, there is room for code clean-ups.
Signed-off-by Jean Delvare <[email protected]>
Cc Andre Prendel <[email protected]>
--- drivers/hwmon/tmp401.c | 57 ++++++++++++++++++++++-------------------------- drivers/hwmon/tmp421.c | 43 ++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 53 deletions(-)
drivers/hwmon/tmp401.c +27 -30
@@ -488,46 +488,43 @@ static void tmp401_init_client(struct i2i2c_smbus_write_byte_data (client,TMP401_CONFIG_WRITE , config); } -static int tmp401_detect (struct i2c_client *client,int kind, +static int tmp401_detect (struct i2c_client *client,int _kind,struct i2c_board_info *info) { +enum chips kind;struct i2c_adapter *adapter = client->adapter; +u8 reg;if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE_DATA ))return -ENODEV ;/* Detect and identify the chip */ -if (kind <=0 ) { -u8 reg; + reg =i2c_smbus_read_byte_data (client,TMP401_MANUFACTURER_ID_REG ); +if (reg !=TMP401_MANUFACTURER_ID ) +return -ENODEV ; + + reg =i2c_smbus_read_byte_data (client,TMP401_DEVICE_ID_REG ); - reg =i2c_smbus_read_byte_data (client, -TMP401_MANUFACTURER_ID_REG ); -if (reg !=TMP401_MANUFACTURER_ID ) -return -ENODEV ; - - reg =i2c_smbus_read_byte_data (client,TMP401_DEVICE_ID_REG ); - -switch (reg) { -case TMP401_DEVICE_ID : - kind = tmp401; -break ; -case TMP411_DEVICE_ID : - kind = tmp411; -break ; -default : -return -ENODEV ; - } - - reg =i2c_smbus_read_byte_data (client,TMP401_CONFIG_READ ); -if (reg &0x1b ) -return -ENODEV ; - - reg =i2c_smbus_read_byte_data (client, -TMP401_CONVERSION_RATE_READ ); -/* Datasheet says: 0x1-0x6 */ -if (reg >15 ) -return -ENODEV ; +switch (reg) { +case TMP401_DEVICE_ID : + kind = tmp401; +break ; +case TMP411_DEVICE_ID : + kind = tmp411; +break ; +default : +return -ENODEV ; } + + reg =i2c_smbus_read_byte_data (client,TMP401_CONFIG_READ ); +if (reg &0x1b ) +return -ENODEV ; + + reg =i2c_smbus_read_byte_data (client,TMP401_CONVERSION_RATE_READ ); +/* Datasheet says: 0x1-0x6 */ +if (reg >15 ) +return -ENODEV ; +strlcpy (info->type, tmp401_id[kind -1 ].name,I2C_NAME_SIZE );return 0 ;
drivers/hwmon/tmp421.c +20 -23
59 lines not on this page · raw message
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Andre,
Quoted 10 lines · Andre Prendel
Quoted 4 lines · Jean Delvare
As kind is now hard-coded to -1, there is room for code clean-ups.
Signed-off-by Jean Delvare <[email protected]>Cc Andre Prendel <[email protected]>Acked-by Andre Prendel <[email protected]>Out of curiosity, could you please point me to the commit changing this in i2c-core?
No commit yet, but a patch pending:
http://marc.info/?l=linux-i2c&m5484528631847&w=2
And there's more to come, in particular patches killing the I2C_CLIENT_INSMOD marcros. But I didn't post them yet: due to the cross-subsystem changes, they don't fit in linux-next yet.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors