mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 00:53:34 +02:00
soc: samsung: exynos-chipid: use dev_err_probe where appropiate
Use dev_err_probe() to benefit of the standardized format of the error code (e.g. "ENODEV" instead of -19), to get meanigful error messages, and for more compact error paths. Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> Reviewed-by: André Draszik <andre.draszik@linaro.org> Link: https://patch.msgid.link/20251120-gs101-chipid-v3-2-1aeaa8b7fe35@linaro.org Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
parent
1b3376d216
commit
8dfbb5fcb7
|
|
@ -81,8 +81,8 @@ static const char *product_id_to_soc_id(unsigned int product_id)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int exynos_chipid_get_chipid_info(struct regmap *regmap,
|
||||
const struct exynos_chipid_variant *data,
|
||||
static int exynos_chipid_get_chipid_info(struct device *dev,
|
||||
struct regmap *regmap, const struct exynos_chipid_variant *data,
|
||||
struct exynos_chipid_info *soc_info)
|
||||
{
|
||||
int ret;
|
||||
|
|
@ -90,13 +90,14 @@ static int exynos_chipid_get_chipid_info(struct regmap *regmap,
|
|||
|
||||
ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &val);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return dev_err_probe(dev, ret, "failed to read Product ID\n");
|
||||
soc_info->product_id = val & EXYNOS_MASK;
|
||||
|
||||
if (data->rev_reg != EXYNOS_CHIPID_REG_PRO_ID) {
|
||||
ret = regmap_read(regmap, data->rev_reg, &val);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return dev_err_probe(dev, ret,
|
||||
"failed to read revision\n");
|
||||
}
|
||||
main_rev = (val >> data->main_rev_shift) & EXYNOS_REV_PART_MASK;
|
||||
sub_rev = (val >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK;
|
||||
|
|
@ -123,13 +124,15 @@ static int exynos_chipid_probe(struct platform_device *pdev)
|
|||
|
||||
drv_data = of_device_get_match_data(dev);
|
||||
if (!drv_data)
|
||||
return -EINVAL;
|
||||
return dev_err_probe(dev, -EINVAL,
|
||||
"failed to get match data\n");
|
||||
|
||||
regmap = device_node_to_regmap(dev->of_node);
|
||||
if (IS_ERR(regmap))
|
||||
return PTR_ERR(regmap);
|
||||
return dev_err_probe(dev, PTR_ERR(regmap),
|
||||
"failed to get regmap\n");
|
||||
|
||||
ret = exynos_chipid_get_chipid_info(regmap, drv_data, &soc_info);
|
||||
ret = exynos_chipid_get_chipid_info(dev, regmap, drv_data, &soc_info);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
@ -148,15 +151,14 @@ static int exynos_chipid_probe(struct platform_device *pdev)
|
|||
if (!soc_dev_attr->revision)
|
||||
return -ENOMEM;
|
||||
soc_dev_attr->soc_id = product_id_to_soc_id(soc_info.product_id);
|
||||
if (!soc_dev_attr->soc_id) {
|
||||
pr_err("Unknown SoC\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
if (!soc_dev_attr->soc_id)
|
||||
return dev_err_probe(dev, -ENODEV, "Unknown SoC\n");
|
||||
|
||||
/* please note that the actual registration will be deferred */
|
||||
soc_dev = soc_device_register(soc_dev_attr);
|
||||
if (IS_ERR(soc_dev))
|
||||
return PTR_ERR(soc_dev);
|
||||
return dev_err_probe(dev, PTR_ERR(soc_dev),
|
||||
"failed to register to the soc interface\n");
|
||||
|
||||
ret = devm_add_action_or_reset(dev, exynos_chipid_unregister_soc,
|
||||
soc_dev);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user