ALSA: hda: cs35l41: Consistently use dev_err_probe()
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Thu, 7 Sep 2023 17:10:10 +0000 (20:10 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 11 Sep 2023 12:34:42 +0000 (13:34 +0100)
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>
sound/pci/hda/cs35l41_hda.c

index 565f7b897436e2ea50ea2da805df218ebbc906fe..c74faa2ff46c0c5686ed956e64b3e3d884c6b993 100644 (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,
                                       int_status & CS35L41_OTP_BOOT_DONE, 1000, 100000);
        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;
        }
 
        ret = regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS3, &int_sts);
        if (ret || (int_sts & CS35L41_OTP_BOOT_ERR)) {
-               dev_err(cs35l41->dev, "OTP Boot status %x error: %d\n",
-                       int_sts & CS35L41_OTP_BOOT_ERR, ret);
+               dev_err_probe(cs35l41->dev, ret, "OTP Boot status %x error\n",
+                             int_sts & CS35L41_OTP_BOOT_ERR);
                ret = -EIO;
                goto err;
        }
 
        ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid);
        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;
        }
 
        ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid);
        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;
        }
 
@@ -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);
        if (ret) {
-               dev_err(cs35l41->dev, "OTP Unpack failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "OTP Unpack failed\n");
                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);
        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;
        }