Commit c1db3d5c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron

iio: accel: adxl345: Get rid of name parameter in adxl345_core_probe()

As a preparation to switch to use device properties, get rid of name
parameter in adxl345_core_probe(). Instead, choose it based on the type.
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-3-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 024f5d4f
...@@ -13,7 +13,6 @@ enum adxl345_device_type { ...@@ -13,7 +13,6 @@ enum adxl345_device_type {
ADXL375 = 2, ADXL375 = 2,
}; };
int adxl345_core_probe(struct device *dev, struct regmap *regmap, int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type);
enum adxl345_device_type type, const char *name);
#endif /* _ADXL345_H_ */ #endif /* _ADXL345_H_ */
...@@ -213,14 +213,25 @@ static void adxl345_powerdown(void *regmap) ...@@ -213,14 +213,25 @@ static void adxl345_powerdown(void *regmap)
regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY);
} }
int adxl345_core_probe(struct device *dev, struct regmap *regmap, int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type)
enum adxl345_device_type type, const char *name)
{ {
struct adxl345_data *data; struct adxl345_data *data;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
const char *name;
u32 regval; u32 regval;
int ret; int ret;
switch (type) {
case ADXL345:
name = "adxl345";
break;
case ADXL375:
name = "adxl375";
break;
default:
return -EINVAL;
}
ret = regmap_read(regmap, ADXL345_REG_DEVID, &regval); ret = regmap_read(regmap, ADXL345_REG_DEVID, &regval);
if (ret < 0) if (ret < 0)
return dev_err_probe(dev, ret, "Error reading device ID\n"); return dev_err_probe(dev, ret, "Error reading device ID\n");
......
...@@ -31,8 +31,7 @@ static int adxl345_i2c_probe(struct i2c_client *client, ...@@ -31,8 +31,7 @@ static int adxl345_i2c_probe(struct i2c_client *client,
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n");
return adxl345_core_probe(&client->dev, regmap, id->driver_data, return adxl345_core_probe(&client->dev, regmap, id->driver_data);
id->name);
} }
static const struct i2c_device_id adxl345_i2c_id[] = { static const struct i2c_device_id adxl345_i2c_id[] = {
......
...@@ -34,7 +34,7 @@ static int adxl345_spi_probe(struct spi_device *spi) ...@@ -34,7 +34,7 @@ static int adxl345_spi_probe(struct spi_device *spi)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); 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); return adxl345_core_probe(&spi->dev, regmap, id->driver_data);
} }
static const struct spi_device_id adxl345_spi_id[] = { static const struct spi_device_id adxl345_spi_id[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment