/* get the clock */
        priv->mclk = devm_clk_get(dev, "pmc_plt_clk_3");
-       if (IS_ERR(priv->mclk)) {
-               ret = PTR_ERR(priv->mclk);
-               dev_err(dev, "clk_get pmc_plt_clk_3 failed: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(priv->mclk))
+               return dev_err_probe(dev, PTR_ERR(priv->mclk), "clk_get pmc_plt_clk_3 failed\n");
 
        /* get speaker enable GPIO */
        codec_dev = acpi_get_first_physical_node(adev);
                                   /* see comment in byt_cht_es8316_resume() */
                                   GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
        if (IS_ERR(priv->speaker_en_gpio)) {
-               ret = PTR_ERR(priv->speaker_en_gpio);
-               switch (ret) {
-               default:
-                       dev_err(dev, "get speaker GPIO failed: %d\n", ret);
-                       fallthrough;
-               case -EPROBE_DEFER:
-                       goto err_put_codec;
-               }
+               ret = dev_err_probe(dev, PTR_ERR(priv->speaker_en_gpio),
+                                   "get speaker GPIO failed\n");
+               goto err_put_codec;
        }
 
        snprintf(components_string, sizeof(components_string),