Commit 01676b0f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20220222090009.2060-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent b30537a4

drivers/iio/accel/adxl345_core.c

+9 −17
Original line number Diff line number Diff line
@@ -222,16 +222,12 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, 
	int ret;



	ret = regmap_read(regmap, ADXL345_REG_DEVID, &regval);

	if (ret < 0) {

		dev_err(dev, "Error reading device ID: %d\n", ret);

		return ret;

	}

	if (ret < 0)

		return dev_err_probe(dev, ret, "Error reading device ID\n");



	if (regval != ADXL345_DEVID) {

		dev_err(dev, "Invalid device ID: %x, expected %x\n",

	if (regval != ADXL345_DEVID)

		return dev_err_probe(dev, -ENODEV, "Invalid device ID: %x, expected %x\n",

				     regval, ADXL345_DEVID);

		return -ENODEV;

	}



	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));

	if (!indio_dev)
@@ -245,10 +241,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, 


	ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT,

			   data->data_range);

	if (ret < 0) {

		dev_err(dev, "Failed to set data range: %d\n", ret);

		return ret;

	}

	if (ret < 0)

		return dev_err_probe(dev, ret, "Failed to set data range\n");



	indio_dev->name = name;

	indio_dev->info = &adxl345_info;
@@ -259,10 +253,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, 
	/* Enable measurement mode */

	ret = regmap_write(data->regmap, ADXL345_REG_POWER_CTL,

			   ADXL345_POWER_CTL_MEASURE);

	if (ret < 0) {

		dev_err(dev, "Failed to enable measurement mode: %d\n", ret);

		return ret;

	}

	if (ret < 0)

		return dev_err_probe(dev, ret, "Failed to enable measurement mode\n");



	ret = devm_add_action_or_reset(dev, adxl345_powerdown, data->regmap);

	if (ret < 0)

drivers/iio/accel/adxl345_i2c.c

+2 −5
Original line number Diff line number Diff line
@@ -28,11 +28,8 @@ static int adxl345_i2c_probe(struct i2c_client *client, 
		return -ENODEV;



	regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config);

	if (IS_ERR(regmap)) {

		dev_err(&client->dev, "Error initializing i2c regmap: %ld\n",

			PTR_ERR(regmap));

		return PTR_ERR(regmap);

	}

	if (IS_ERR(regmap))

		return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n");



	return adxl345_core_probe(&client->dev, regmap, id->driver_data,

				  id->name);

drivers/iio/accel/adxl345_spi.c

+5 −10
Original line number Diff line number Diff line
@@ -26,18 +26,13 @@ static int adxl345_spi_probe(struct spi_device *spi) 
	struct regmap *regmap;



	/* Bail out if max_speed_hz exceeds 5 MHz */

	if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) {

		dev_err(&spi->dev, "SPI CLK, %d Hz exceeds 5 MHz\n",

	if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ)

		return dev_err_probe(&spi->dev, -EINVAL, "SPI CLK, %d Hz exceeds 5 MHz\n",

				     spi->max_speed_hz);

		return -EINVAL;

	}



	regmap = devm_regmap_init_spi(spi, &adxl345_spi_regmap_config);

	if (IS_ERR(regmap)) {

		dev_err(&spi->dev, "Error initializing spi regmap: %ld\n",

			PTR_ERR(regmap));

		return PTR_ERR(regmap);

	}

	if (IS_ERR(regmap))

		return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n");



	return adxl345_core_probe(&spi->dev, regmap, id->driver_data, id->name);

}