iio: accel: adxl345: Convert to use dev_err_probe()

It's fine to call dev_err_probe() in ->probe() when error code is known.
Convert the driver to use dev_err_probe().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20220222090009.2060-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Andy Shevchenko and committed by

Jonathan Cameron 4 years ago 01676b0f b30537a4

+16 -32

3 changed files

expand all

drivers

iio

accel

adxl345_core.c

adxl345_i2c.c

adxl345_spi.c

+9 -17

drivers/iio/accel/adxl345_core.c

··· 222 222 int ret; 223 223 224 224 ret = regmap_read(regmap, ADXL345_REG_DEVID, &regval); 225 - if (ret < 0) { 226 - dev_err(dev, "Error reading device ID: %d\n", ret); 227 - return ret; 228 - } 225 + if (ret < 0) 226 + return dev_err_probe(dev, ret, "Error reading device ID\n"); 229 227 230 - if (regval != ADXL345_DEVID) { 231 - dev_err(dev, "Invalid device ID: %x, expected %x\n", 232 - regval, ADXL345_DEVID); 233 - return -ENODEV; 234 - } 228 + if (regval != ADXL345_DEVID) 229 + return dev_err_probe(dev, -ENODEV, "Invalid device ID: %x, expected %x\n", 230 + regval, ADXL345_DEVID); 235 231 236 232 indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); 237 233 if (!indio_dev) ··· 241 245 242 246 ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT, 243 247 data->data_range); 244 - if (ret < 0) { 245 - dev_err(dev, "Failed to set data range: %d\n", ret); 246 - return ret; 247 - } 248 + if (ret < 0) 249 + return dev_err_probe(dev, ret, "Failed to set data range\n"); 248 250 249 251 indio_dev->name = name; 250 252 indio_dev->info = &adxl345_info; ··· 253 259 /* Enable measurement mode */ 254 260 ret = regmap_write(data->regmap, ADXL345_REG_POWER_CTL, 255 261 ADXL345_POWER_CTL_MEASURE); 256 - if (ret < 0) { 257 - dev_err(dev, "Failed to enable measurement mode: %d\n", ret); 258 - return ret; 259 - } 262 + if (ret < 0) 263 + return dev_err_probe(dev, ret, "Failed to enable measurement mode\n"); 260 264 261 265 ret = devm_add_action_or_reset(dev, adxl345_powerdown, data->regmap); 262 266 if (ret < 0)

+2 -5

drivers/iio/accel/adxl345_i2c.c

··· 28 28 return -ENODEV; 29 29 30 30 regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); 31 - if (IS_ERR(regmap)) { 32 - dev_err(&client->dev, "Error initializing i2c regmap: %ld\n", 33 - PTR_ERR(regmap)); 34 - return PTR_ERR(regmap); 35 - } 31 + if (IS_ERR(regmap)) 32 + return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); 36 33 37 34 return adxl345_core_probe(&client->dev, regmap, id->driver_data, 38 35 id->name);

+5 -10

drivers/iio/accel/adxl345_spi.c

··· 26 26 struct regmap *regmap; 27 27 28 28 /* Bail out if max_speed_hz exceeds 5 MHz */ 29 - if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) { 30 - dev_err(&spi->dev, "SPI CLK, %d Hz exceeds 5 MHz\n", 31 - spi->max_speed_hz); 32 - return -EINVAL; 33 - } 29 + if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) 30 + return dev_err_probe(&spi->dev, -EINVAL, "SPI CLK, %d Hz exceeds 5 MHz\n", 31 + spi->max_speed_hz); 34 32 35 33 regmap = devm_regmap_init_spi(spi, &adxl345_spi_regmap_config); 36 - if (IS_ERR(regmap)) { 37 - dev_err(&spi->dev, "Error initializing spi regmap: %ld\n", 38 - PTR_ERR(regmap)); 39 - return PTR_ERR(regmap); 40 - } 34 + if (IS_ERR(regmap)) 35 + return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); 41 36 42 37 return adxl345_core_probe(&spi->dev, regmap, id->driver_data, id->name); 43 38 }

Configure Feed

Configure Feed