kevin/linux
1
Fork 0
Code

hwmon: (adt7470) Use multi-byte regmap operations

Browse Source 
Use multi-byte regmap operations where possible to reduce code size
and the need for mutex protection.

No functional change.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2024-07-09 07:16:43 -07:00
parent 8400291e28
commit 381cfd6305
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/hwmon/adt7470.c
View File

@ -728,30 +728,22 @@ static const int adt7470_freq_map[] = {
static int pwm1_freq_get(struct device *dev) static int pwm1_freq_get(struct device *dev)
{ {
struct adt7470_data *data = dev_get_drvdata(dev); struct adt7470_data *data = dev_get_drvdata(dev);
unsigned int cfg_reg_1, cfg_reg_2; unsigned int regs[2] = {ADT7470_REG_CFG, ADT7470_REG_CFG_2};
u8 cfg_reg[2];
int index; int index;
int err; int err;
mutex_lock(&data->lock); err = regmap_multi_reg_read(data->regmap, regs, cfg_reg, 2);
err = regmap_read(data->regmap, ADT7470_REG_CFG, &cfg_reg_1); if (err)
if (err < 0) return err;
goto out;
err = regmap_read(data->regmap, ADT7470_REG_CFG_2, &cfg_reg_2);
if (err < 0)
goto out;
mutex_unlock(&data->lock);
index = (cfg_reg_2 & ADT7470_FREQ_MASK) >> ADT7470_FREQ_SHIFT; index = (cfg_reg[1] & ADT7470_FREQ_MASK) >> ADT7470_FREQ_SHIFT;
if (!(cfg_reg_1 & ADT7470_CFG_LF)) if (!(cfg_reg[0] & ADT7470_CFG_LF))
index += 8; index += 8;
if (index >= ARRAY_SIZE(adt7470_freq_map)) if (index >= ARRAY_SIZE(adt7470_freq_map))
index = ARRAY_SIZE(adt7470_freq_map) - 1; index = ARRAY_SIZE(adt7470_freq_map) - 1;
return adt7470_freq_map[index]; return adt7470_freq_map[index];
out:
mutex_unlock(&data->lock);
return err;
} }
static int adt7470_pwm_read(struct device *dev, u32 attr, int channel, long *val) static int adt7470_pwm_read(struct device *dev, u32 attr, int channel, long *val)