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, ®id);
        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, ®_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;
        }
 
 
        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;
        }
 
 
        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;
        }