"headset-mic-detect", GPIOD_IN,
                                                           "headset-mic-detect");
                if (IS_ERR(priv->hsmic_detect)) {
-                       ret_val = PTR_ERR(priv->hsmic_detect);
-                       dev_err_probe(dev, ret_val, "getting hsmic-detect GPIO\n");
+                       ret_val = dev_err_probe(dev, PTR_ERR(priv->hsmic_detect),
+                                               "getting hsmic-detect GPIO\n");
                        goto err_device;
                }
        }
        if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {
                priv->mclk = devm_clk_get_optional(dev, "pmc_plt_clk_3");
                if (IS_ERR(priv->mclk)) {
-                       ret_val = PTR_ERR(priv->mclk);
-
-                       dev_err(dev,
-                               "Failed to get MCLK from pmc_plt_clk_3: %d\n",
-                               ret_val);
-
+                       ret_val = dev_err_probe(dev, PTR_ERR(priv->mclk),
+                                               "Failed to get MCLK from pmc_plt_clk_3\n");
                        goto err;
                }
                /*