UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: imu: adis16480: Improve getting the optional clocks 

The extended clocks are optional and may not be present for some
configurations supported by this driver. Nevertheless, in case
the clock is provided but some error happens during its getting,
that error handling should be done properly.

Use devm_clk_get_optional() API and report possible errors using
dev_err_probe() to handle properly -EPROBE_DEFER error.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Tested-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20220414131559.24694-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2022-04-14 16:15:59 +03:00 committed by Jonathan Cameron
parent 79f4dc9dec
commit cb55b44285
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/iio/imu/adis16480.c
View File

@ -1362,31 +1362,25 @@ static int adis16480_get_ext_clocks(struct adis16480 *st)
{ {
struct device *dev = &st->adis.spi->dev; struct device *dev = &st->adis.spi->dev;
st->clk_mode = ADIS16480_CLK_INT; st->ext_clk = devm_clk_get_optional(dev, "sync");
st->ext_clk = devm_clk_get(dev, "sync"); if (IS_ERR(st->ext_clk))
if (!IS_ERR_OR_NULL(st->ext_clk)) { return dev_err_probe(dev, PTR_ERR(st->ext_clk), "failed to get ext clk\n");
if (st->ext_clk) {
st->clk_mode = ADIS16480_CLK_SYNC; st->clk_mode = ADIS16480_CLK_SYNC;
return 0; return 0;
} }
if (PTR_ERR(st->ext_clk) != -ENOENT) {
dev_err(dev, "failed to get ext clk\n");
return PTR_ERR(st->ext_clk);
}
if (st->chip_info->has_pps_clk_mode) { if (st->chip_info->has_pps_clk_mode) {
st->ext_clk = devm_clk_get(dev, "pps"); st->ext_clk = devm_clk_get_optional(dev, "pps");
if (!IS_ERR_OR_NULL(st->ext_clk)) { if (IS_ERR(st->ext_clk))
return dev_err_probe(dev, PTR_ERR(st->ext_clk), "failed to get ext clk\n");
if (st->ext_clk) {
st->clk_mode = ADIS16480_CLK_PPS; st->clk_mode = ADIS16480_CLK_PPS;
return 0; return 0;
} }
if (PTR_ERR(st->ext_clk) != -ENOENT) {
dev_err(dev, "failed to get ext clk\n");
return PTR_ERR(st->ext_clk);
}
} }
st->clk_mode = ADIS16480_CLK_INT;
return 0; return 0;
} }
@ -1447,7 +1441,7 @@ static int adis16480_probe(struct spi_device *spi)
if (ret) if (ret)
return ret; return ret;
if (!IS_ERR_OR_NULL(st->ext_clk)) { if (st->ext_clk) {
ret = adis16480_ext_clk_config(st, true); ret = adis16480_ext_clk_config(st, true);
if (ret) if (ret)
return ret; return ret;