Skip to content

L
linux
Commit 722fc316 authored by Alison Schofield's avatar Alison Schofield Committed by Jonathan Cameron
Browse files
Options

staging: iio: isl29028: use regmap to retrieve struct device 

Driver includes struct regmap and struct device in its global data.
Remove the struct device and use regmap API to retrieve device info.

Simplified version of Coccinelle semantic patch used:

@ a @
identifier drvdata, r;
position p;
@@
  struct drvdata@p {
  ...
  struct regmap *r;
  ...
  };

@ b @
identifier a.drvdata, d;
position a.p;
@@
  struct drvdata@p {
  ...
- struct device *d;
  ...
  };

@ passed depends on b @
identifier a.drvdata, a.r, b.d, i, f;
@@
  f (..., struct drvdata *i ,...) {
+ struct device *dev = regmap_get_device(i->r);
   <+...
-	   i->d
+	   dev
   ...+>
  }
Signed-off-by: default avatarAlison Schofield <amsfield22@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 6ad515c6
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 25 deletions
drivers/staging/iio/light/isl29028.c
View file @ 722fc316
...@@ -69,7 +69,6 @@ enum als_ir_mode { ...@@ -69,7 +69,6 @@ enum als_ir_mode {
}; };
struct isl29028_chip { struct isl29028_chip {
struct device *dev;
struct mutex lock; struct mutex lock;
struct regmap *regmap; struct regmap *regmap;
...@@ -166,20 +165,21 @@ static int isl29028_set_als_ir_mode(struct isl29028_chip *chip, ...@@ -166,20 +165,21 @@ static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,
static int isl29028_read_als_ir(struct isl29028_chip *chip, int *als_ir) static int isl29028_read_als_ir(struct isl29028_chip *chip, int *als_ir)
{ {
struct device *dev = regmap_get_device(chip->regmap);
unsigned int lsb; unsigned int lsb;
unsigned int msb; unsigned int msb;
int ret; int ret;
ret = regmap_read(chip->regmap, ISL29028_REG_ALSIR_L, &lsb); ret = regmap_read(chip->regmap, ISL29028_REG_ALSIR_L, &lsb);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Error in reading register ALSIR_L err %d\n", ret); "Error in reading register ALSIR_L err %d\n", ret);
return ret; return ret;
} }
ret = regmap_read(chip->regmap, ISL29028_REG_ALSIR_U, &msb); ret = regmap_read(chip->regmap, ISL29028_REG_ALSIR_U, &msb);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Error in reading register ALSIR_U err %d\n", ret); "Error in reading register ALSIR_U err %d\n", ret);
return ret; return ret;
} }
...@@ -190,12 +190,13 @@ static int isl29028_read_als_ir(struct isl29028_chip *chip, int *als_ir) ...@@ -190,12 +190,13 @@ static int isl29028_read_als_ir(struct isl29028_chip *chip, int *als_ir)
static int isl29028_read_proxim(struct isl29028_chip *chip, int *prox) static int isl29028_read_proxim(struct isl29028_chip *chip, int *prox)
{ {
struct device *dev = regmap_get_device(chip->regmap);
unsigned int data; unsigned int data;
int ret; int ret;
ret = regmap_read(chip->regmap, ISL29028_REG_PROX_DATA, &data); ret = regmap_read(chip->regmap, ISL29028_REG_PROX_DATA, &data);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "Error in reading register %d, error %d\n", dev_err(dev, "Error in reading register %d, error %d\n",
ISL29028_REG_PROX_DATA, ret); ISL29028_REG_PROX_DATA, ret);
return ret; return ret;
} }
...@@ -218,13 +219,14 @@ static int isl29028_proxim_get(struct isl29028_chip *chip, int *prox_data) ...@@ -218,13 +219,14 @@ static int isl29028_proxim_get(struct isl29028_chip *chip, int *prox_data)
static int isl29028_als_get(struct isl29028_chip *chip, int *als_data) static int isl29028_als_get(struct isl29028_chip *chip, int *als_data)
{ {
struct device *dev = regmap_get_device(chip->regmap);
int ret; int ret;
int als_ir_data; int als_ir_data;
if (chip->als_ir_mode != MODE_ALS) { if (chip->als_ir_mode != MODE_ALS) {
ret = isl29028_set_als_ir_mode(chip, MODE_ALS); ret = isl29028_set_als_ir_mode(chip, MODE_ALS);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Error in enabling ALS mode err %d\n", ret); "Error in enabling ALS mode err %d\n", ret);
return ret; return ret;
} }
...@@ -251,12 +253,13 @@ static int isl29028_als_get(struct isl29028_chip *chip, int *als_data) ...@@ -251,12 +253,13 @@ static int isl29028_als_get(struct isl29028_chip *chip, int *als_data)
static int isl29028_ir_get(struct isl29028_chip *chip, int *ir_data) static int isl29028_ir_get(struct isl29028_chip *chip, int *ir_data)
{ {
struct device *dev = regmap_get_device(chip->regmap);
int ret; int ret;
if (chip->als_ir_mode != MODE_IR) { if (chip->als_ir_mode != MODE_IR) {
ret = isl29028_set_als_ir_mode(chip, MODE_IR); ret = isl29028_set_als_ir_mode(chip, MODE_IR);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Error in enabling IR mode err %d\n", ret); "Error in enabling IR mode err %d\n", ret);
return ret; return ret;
} }
...@@ -271,25 +274,26 @@ static int isl29028_write_raw(struct iio_dev *indio_dev, ...@@ -271,25 +274,26 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
int val, int val2, long mask) int val, int val2, long mask)
{ {
struct isl29028_chip *chip = iio_priv(indio_dev); struct isl29028_chip *chip = iio_priv(indio_dev);
struct device *dev = regmap_get_device(chip->regmap);
int ret = -EINVAL; int ret = -EINVAL;
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
switch (chan->type) { switch (chan->type) {
case IIO_PROXIMITY: case IIO_PROXIMITY:
if (mask != IIO_CHAN_INFO_SAMP_FREQ) { if (mask != IIO_CHAN_INFO_SAMP_FREQ) {
dev_err(chip->dev, dev_err(dev,
"proximity: mask value 0x%08lx not supported\n", "proximity: mask value 0x%08lx not supported\n",
mask); mask);
break; break;
} }
if (val < 1 || val > 100) { if (val < 1 || val > 100) {
dev_err(chip->dev, dev_err(dev,
"Samp_freq %d is not in range[1:100]\n", val); "Samp_freq %d is not in range[1:100]\n", val);
break; break;
} }
ret = isl29028_set_proxim_sampling(chip, val); ret = isl29028_set_proxim_sampling(chip, val);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Setting proximity samp_freq fail, err %d\n", "Setting proximity samp_freq fail, err %d\n",
ret); ret);
break; break;
...@@ -299,19 +303,19 @@ static int isl29028_write_raw(struct iio_dev *indio_dev, ...@@ -299,19 +303,19 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
case IIO_LIGHT: case IIO_LIGHT:
if (mask != IIO_CHAN_INFO_SCALE) { if (mask != IIO_CHAN_INFO_SCALE) {
dev_err(chip->dev, dev_err(dev,
"light: mask value 0x%08lx not supported\n", "light: mask value 0x%08lx not supported\n",
mask); mask);
break; break;
} }
if ((val != 125) && (val != 2000)) { if ((val != 125) && (val != 2000)) {
dev_err(chip->dev, dev_err(dev,
"lux scale %d is invalid [125, 2000]\n", val); "lux scale %d is invalid [125, 2000]\n", val);
break; break;
} }
ret = isl29028_set_als_scale(chip, val); ret = isl29028_set_als_scale(chip, val);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, dev_err(dev,
"Setting lux scale fail with error %d\n", ret); "Setting lux scale fail with error %d\n", ret);
break; break;
} }
...@@ -319,7 +323,7 @@ static int isl29028_write_raw(struct iio_dev *indio_dev, ...@@ -319,7 +323,7 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
break; break;
default: default:
dev_err(chip->dev, "Unsupported channel type\n"); dev_err(dev, "Unsupported channel type\n");
break; break;
} }
mutex_unlock(&chip->lock); mutex_unlock(&chip->lock);
...@@ -331,6 +335,7 @@ static int isl29028_read_raw(struct iio_dev *indio_dev, ...@@ -331,6 +335,7 @@ static int isl29028_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask) int *val, int *val2, long mask)
{ {
struct isl29028_chip *chip = iio_priv(indio_dev); struct isl29028_chip *chip = iio_priv(indio_dev);
struct device *dev = regmap_get_device(chip->regmap);
int ret = -EINVAL; int ret = -EINVAL;
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
...@@ -370,7 +375,7 @@ static int isl29028_read_raw(struct iio_dev *indio_dev, ...@@ -370,7 +375,7 @@ static int isl29028_read_raw(struct iio_dev *indio_dev,
break; break;
default: default:
dev_err(chip->dev, "mask value 0x%08lx not supported\n", mask); dev_err(dev, "mask value 0x%08lx not supported\n", mask);
break; break;
} }
mutex_unlock(&chip->lock); mutex_unlock(&chip->lock);
...@@ -417,6 +422,7 @@ static const struct iio_info isl29028_info = { ...@@ -417,6 +422,7 @@ static const struct iio_info isl29028_info = {
static int isl29028_chip_init(struct isl29028_chip *chip) static int isl29028_chip_init(struct isl29028_chip *chip)
{ {
struct device *dev = regmap_get_device(chip->regmap);
int ret; int ret;
chip->enable_prox = false; chip->enable_prox = false;
...@@ -426,35 +432,33 @@ static int isl29028_chip_init(struct isl29028_chip *chip) ...@@ -426,35 +432,33 @@ static int isl29028_chip_init(struct isl29028_chip *chip)
ret = regmap_write(chip->regmap, ISL29028_REG_TEST1_MODE, 0x0); ret = regmap_write(chip->regmap, ISL29028_REG_TEST1_MODE, 0x0);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "%s(): write to reg %d failed, err = %d\n", dev_err(dev, "%s(): write to reg %d failed, err = %d\n",
__func__, ISL29028_REG_TEST1_MODE, ret); __func__, ISL29028_REG_TEST1_MODE, ret);
return ret; return ret;
} }
ret = regmap_write(chip->regmap, ISL29028_REG_TEST2_MODE, 0x0); ret = regmap_write(chip->regmap, ISL29028_REG_TEST2_MODE, 0x0);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "%s(): write to reg %d failed, err = %d\n", dev_err(dev, "%s(): write to reg %d failed, err = %d\n",
__func__, ISL29028_REG_TEST2_MODE, ret); __func__, ISL29028_REG_TEST2_MODE, ret);
return ret; return ret;
} }
ret = regmap_write(chip->regmap, ISL29028_REG_CONFIGURE, 0x0); ret = regmap_write(chip->regmap, ISL29028_REG_CONFIGURE, 0x0);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "%s(): write to reg %d failed, err = %d\n", dev_err(dev, "%s(): write to reg %d failed, err = %d\n",
__func__, ISL29028_REG_CONFIGURE, ret); __func__, ISL29028_REG_CONFIGURE, ret);
return ret; return ret;
} }
ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling); ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "setting the proximity, err = %d\n", dev_err(dev, "setting the proximity, err = %d\n", ret);
ret);
return ret; return ret;
} }
ret = isl29028_set_als_scale(chip, chip->lux_scale); ret = isl29028_set_als_scale(chip, chip->lux_scale);
if (ret < 0) if (ret < 0)
dev_err(chip->dev, dev_err(dev, "setting als scale failed, err = %d\n", ret);
"setting als scale failed, err = %d\n", ret);
return ret; return ret;
} }
...@@ -496,19 +500,19 @@ static int isl29028_probe(struct i2c_client *client, ...@@ -496,19 +500,19 @@ static int isl29028_probe(struct i2c_client *client,
chip = iio_priv(indio_dev); chip = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
chip->dev = &client->dev;
mutex_init(&chip->lock); mutex_init(&chip->lock);
chip->regmap = devm_regmap_init_i2c(client, &isl29028_regmap_config); chip->regmap = devm_regmap_init_i2c(client, &isl29028_regmap_config);
if (IS_ERR(chip->regmap)) { if (IS_ERR(chip->regmap)) {
ret = PTR_ERR(chip->regmap); ret = PTR_ERR(chip->regmap);
dev_err(chip->dev, "regmap initialization failed: %d\n", ret); dev_err(&client->dev, "regmap initialization failed: %d\n",
ret);
return ret; return ret;
} }
ret = isl29028_chip_init(chip); ret = isl29028_chip_init(chip);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "chip initialization failed: %d\n", ret); dev_err(&client->dev, "chip initialization failed: %d\n", ret);
return ret; return ret;
} }
...@@ -520,7 +524,8 @@ static int isl29028_probe(struct i2c_client *client, ...@@ -520,7 +524,8 @@ static int isl29028_probe(struct i2c_client *client,
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev); ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "iio registration fails with error %d\n", dev_err(&client->dev,
"iio registration fails with error %d\n",
ret); ret);
return ret; return ret;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7