mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 04:06:54 +07:00
staging: iio: isl29018: fix poorly named function
isl29035_detect() did not just do chip detection. Move functionality directly into isl29018_chip_init() to avoid naming confusion. Signed-off-by: Brian Masney <masneyb@onstation.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
744ef62c2e
commit
8281101c2d
@ -529,30 +529,6 @@ static const struct attribute_group isl29023_group = {
|
||||
.attrs = isl29023_attributes,
|
||||
};
|
||||
|
||||
static int isl29035_detect(struct isl29018_chip *chip)
|
||||
{
|
||||
int status;
|
||||
unsigned int id;
|
||||
struct device *dev = regmap_get_device(chip->regmap);
|
||||
|
||||
status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
|
||||
if (status < 0) {
|
||||
dev_err(dev,
|
||||
"Error reading ID register with error %d\n",
|
||||
status);
|
||||
return status;
|
||||
}
|
||||
|
||||
id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
|
||||
|
||||
if (id != ISL29035_DEVICE_ID)
|
||||
return -ENODEV;
|
||||
|
||||
/* Clear brownout bit */
|
||||
return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
|
||||
ISL29035_BOUT_MASK, 0);
|
||||
}
|
||||
|
||||
enum {
|
||||
isl29018,
|
||||
isl29023,
|
||||
@ -565,7 +541,25 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
|
||||
struct device *dev = regmap_get_device(chip->regmap);
|
||||
|
||||
if (chip->type == isl29035) {
|
||||
status = isl29035_detect(chip);
|
||||
unsigned int id;
|
||||
|
||||
status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
|
||||
if (status < 0) {
|
||||
dev_err(dev,
|
||||
"Error reading ID register with error %d\n",
|
||||
status);
|
||||
return status;
|
||||
}
|
||||
|
||||
id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
|
||||
|
||||
if (id != ISL29035_DEVICE_ID)
|
||||
return -ENODEV;
|
||||
|
||||
/* Clear brownout bit */
|
||||
status = regmap_update_bits(chip->regmap,
|
||||
ISL29035_REG_DEVICE_ID,
|
||||
ISL29035_BOUT_MASK, 0);
|
||||
if (status < 0)
|
||||
return status;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user