Skip to content

Commit 8dfbb5f

Browse files
ambaruskrzk
authored andcommitted
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>
1 parent 1b3376d commit 8dfbb5f

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

drivers/soc/samsung/exynos-chipid.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,23 @@ static const char *product_id_to_soc_id(unsigned int product_id)
8181
return NULL;
8282
}
8383

84-
static int exynos_chipid_get_chipid_info(struct regmap *regmap,
85-
const struct exynos_chipid_variant *data,
84+
static int exynos_chipid_get_chipid_info(struct device *dev,
85+
struct regmap *regmap, const struct exynos_chipid_variant *data,
8686
struct exynos_chipid_info *soc_info)
8787
{
8888
int ret;
8989
unsigned int val, main_rev, sub_rev;
9090

9191
ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &val);
9292
if (ret < 0)
93-
return ret;
93+
return dev_err_probe(dev, ret, "failed to read Product ID\n");
9494
soc_info->product_id = val & EXYNOS_MASK;
9595

9696
if (data->rev_reg != EXYNOS_CHIPID_REG_PRO_ID) {
9797
ret = regmap_read(regmap, data->rev_reg, &val);
9898
if (ret < 0)
99-
return ret;
99+
return dev_err_probe(dev, ret,
100+
"failed to read revision\n");
100101
}
101102
main_rev = (val >> data->main_rev_shift) & EXYNOS_REV_PART_MASK;
102103
sub_rev = (val >> data->sub_rev_shift) & EXYNOS_REV_PART_MASK;
@@ -123,13 +124,15 @@ static int exynos_chipid_probe(struct platform_device *pdev)
123124

124125
drv_data = of_device_get_match_data(dev);
125126
if (!drv_data)
126-
return -EINVAL;
127+
return dev_err_probe(dev, -EINVAL,
128+
"failed to get match data\n");
127129

128130
regmap = device_node_to_regmap(dev->of_node);
129131
if (IS_ERR(regmap))
130-
return PTR_ERR(regmap);
132+
return dev_err_probe(dev, PTR_ERR(regmap),
133+
"failed to get regmap\n");
131134

132-
ret = exynos_chipid_get_chipid_info(regmap, drv_data, &soc_info);
135+
ret = exynos_chipid_get_chipid_info(dev, regmap, drv_data, &soc_info);
133136
if (ret < 0)
134137
return ret;
135138

@@ -148,15 +151,14 @@ static int exynos_chipid_probe(struct platform_device *pdev)
148151
if (!soc_dev_attr->revision)
149152
return -ENOMEM;
150153
soc_dev_attr->soc_id = product_id_to_soc_id(soc_info.product_id);
151-
if (!soc_dev_attr->soc_id) {
152-
pr_err("Unknown SoC\n");
153-
return -ENODEV;
154-
}
154+
if (!soc_dev_attr->soc_id)
155+
return dev_err_probe(dev, -ENODEV, "Unknown SoC\n");
155156

156157
/* please note that the actual registration will be deferred */
157158
soc_dev = soc_device_register(soc_dev_attr);
158159
if (IS_ERR(soc_dev))
159-
return PTR_ERR(soc_dev);
160+
return dev_err_probe(dev, PTR_ERR(soc_dev),
161+
"failed to register to the soc interface\n");
160162

161163
ret = devm_add_action_or_reset(dev, exynos_chipid_unregister_soc,
162164
soc_dev);

0 commit comments

Comments
 (0)