hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: light: gp2ap002: Make use of the helper function dev_err_probe() 

When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Link: https://lore.kernel.org/r/20211008092656.421-3-caihuoqing@baidu.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Cai Huoqing 2021-10-08 17:26:54 +08:00 committed by Jonathan Cameron
parent 0d31d91e61
commit 77b91b1cbc
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iio/light/gp2ap002.c
View File

@ -503,12 +503,9 @@ static int gp2ap002_probe(struct i2c_client *client,
if (!gp2ap002->is_gp2ap002s00f) { if (!gp2ap002->is_gp2ap002s00f) {
gp2ap002->alsout = devm_iio_channel_get(dev, "alsout"); gp2ap002->alsout = devm_iio_channel_get(dev, "alsout");
if (IS_ERR(gp2ap002->alsout)) { if (IS_ERR(gp2ap002->alsout)) {
if (PTR_ERR(gp2ap002->alsout) == -ENODEV) { ret = PTR_ERR(gp2ap002->alsout);
dev_err(dev, "no ADC, deferring...\n"); ret = (ret == -ENODEV) ? -EPROBE_DEFER : ret;
return -EPROBE_DEFER; return dev_err_probe(dev, ret, "failed to get ALSOUT ADC channel\n");
}
dev_err(dev, "failed to get ALSOUT ADC channel\n");
return PTR_ERR(gp2ap002->alsout);
} }
ret = iio_get_channel_type(gp2ap002->alsout, &ch_type); ret = iio_get_channel_type(gp2ap002->alsout, &ch_type);
if (ret < 0) if (ret < 0)
@ -521,15 +518,14 @@ static int gp2ap002_probe(struct i2c_client *client,
} }
gp2ap002->vdd = devm_regulator_get(dev, "vdd"); gp2ap002->vdd = devm_regulator_get(dev, "vdd");
if (IS_ERR(gp2ap002->vdd)) { if (IS_ERR(gp2ap002->vdd))
dev_err(dev, "failed to get VDD regulator\n"); return dev_err_probe(dev, PTR_ERR(gp2ap002->vdd),
return PTR_ERR(gp2ap002->vdd); "failed to get VDD regulator\n");
}
gp2ap002->vio = devm_regulator_get(dev, "vio"); gp2ap002->vio = devm_regulator_get(dev, "vio");
if (IS_ERR(gp2ap002->vio)) { if (IS_ERR(gp2ap002->vio))
dev_err(dev, "failed to get VIO regulator\n"); return dev_err_probe(dev, PTR_ERR(gp2ap002->vio),
return PTR_ERR(gp2ap002->vio); "failed to get VIO regulator\n");
}
/* Operating voltage 2.4V .. 3.6V according to datasheet */ /* Operating voltage 2.4V .. 3.6V according to datasheet */
ret = regulator_set_voltage(gp2ap002->vdd, 2400000, 3600000); ret = regulator_set_voltage(gp2ap002->vdd, 2400000, 3600000);