Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 02:33:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio: chemical: bme680: Move probe errors to dev_err_probe()

Browse Source 
There are multiple cases in the probe function that dev_err_probe() fits
the needs, so use it.

Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20240609233826.330516-13-vassilisamir@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Vasileios Amoiridis 2024-06-10 01:38:23 +02:00 committed by Jonathan Cameron
parent fe358e57af
commit 7cc8f49daa
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/iio/chemical/bme680_core.c
View File

@ -866,18 +866,14 @@ int bme680_core_probe(struct device *dev, struct regmap *regmap,
ret = regmap_write(regmap, BME680_REG_SOFT_RESET,
BME680_CMD_SOFTRESET);
if (ret < 0) {
dev_err(dev, "Failed to reset chip\n");
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "Failed to reset chip\n");
usleep_range(BME680_STARTUP_TIME_US, BME680_STARTUP_TIME_US + 1000);
ret = regmap_read(regmap, BME680_REG_CHIP_ID, &data->check);
if (ret < 0) {
dev_err(dev, "Error reading chip ID\n");
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "Error reading chip ID\n");
if (data->check != BME680_CHIP_ID_VAL) {
dev_err(dev, "Wrong chip ID, got %x expected %x\n",
@ -887,22 +883,19 @@ int bme680_core_probe(struct device *dev, struct regmap *regmap,
ret = bme680_read_calib(data, &data->bme680);
if (ret < 0) {
dev_err(dev,
return dev_err_probe(dev, ret,
"failed to read calibration coefficients at probe\n");
return ret;
}
ret = bme680_chip_config(data);
if (ret < 0) {
dev_err(dev, "failed to set chip_config data\n");
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret,
"failed to set chip_config data\n");
ret = bme680_gas_config(data);
if (ret < 0) {
dev_err(dev, "failed to set gas config data\n");
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret,
"failed to set gas config data\n");
return devm_iio_device_register(dev, indio_dev);
}