iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda: cs35l41: Consistently use dev_err_probe()

Browse Source 
Replace the remaining dev_err() calls in probe() with dev_err_probe(),
to improve consistency.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20230907171010.1447274-12-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cristian Ciocaltea 2023-09-07 20:10:10 +03:00 committed by Mark Brown
parent 85a1bf86fa
commit 206b250c3e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/hda/cs35l41_hda.c
View File

@ -1550,27 +1550,27 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
ret = regmap_read_poll_timeout(cs35l41->regmap, CS35L41_IRQ1_STATUS4, int_status, ret = regmap_read_poll_timeout(cs35l41->regmap, CS35L41_IRQ1_STATUS4, int_status,
int_status & CS35L41_OTP_BOOT_DONE, 1000, 100000); int_status & CS35L41_OTP_BOOT_DONE, 1000, 100000);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "Failed waiting for OTP_BOOT_DONE: %d\n", ret); dev_err_probe(cs35l41->dev, ret, "Failed waiting for OTP_BOOT_DONE\n");
goto err; goto err;
} }
ret = regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS3, &int_sts); ret = regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS3, &int_sts);
if (ret || (int_sts & CS35L41_OTP_BOOT_ERR)) { if (ret || (int_sts & CS35L41_OTP_BOOT_ERR)) {
dev_err(cs35l41->dev, "OTP Boot status %x error: %d\n", dev_err_probe(cs35l41->dev, ret, "OTP Boot status %x error\n",
int_sts & CS35L41_OTP_BOOT_ERR, ret); int_sts & CS35L41_OTP_BOOT_ERR);
ret = -EIO; ret = -EIO;
goto err; goto err;
} }
ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid); ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "Get Device ID failed: %d\n", ret); dev_err_probe(cs35l41->dev, ret, "Get Device ID failed\n");
goto err; goto err;
} }
ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid); ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "Get Revision ID failed: %d\n", ret); dev_err_probe(cs35l41->dev, ret, "Get Revision ID failed\n");
goto err; goto err;
} }
@ -1593,7 +1593,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
ret = cs35l41_otp_unpack(cs35l41->dev, cs35l41->regmap); ret = cs35l41_otp_unpack(cs35l41->dev, cs35l41->regmap);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "OTP Unpack failed: %d\n", ret); dev_err_probe(cs35l41->dev, ret, "OTP Unpack failed\n");
goto err; goto err;
} }
@ -1624,7 +1624,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
ret = component_add(cs35l41->dev, &cs35l41_hda_comp_ops); ret = component_add(cs35l41->dev, &cs35l41_hda_comp_ops);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "Register component failed: %d\n", ret); dev_err_probe(cs35l41->dev, ret, "Register component failed\n");
goto err_pm; goto err_pm;
} }