DEFINE_SHOW_ATTRIBUTE(last_request);
 DEFINE_SHOW_ATTRIBUTE(perf);
 
-int bdisp_debugfs_create(struct bdisp_dev *bdisp)
+void bdisp_debugfs_create(struct bdisp_dev *bdisp)
 {
        char dirname[16];
 
        snprintf(dirname, sizeof(dirname), "%s%d", BDISP_NAME, bdisp->id);
        bdisp->dbg.debugfs_entry = debugfs_create_dir(dirname, NULL);
-       if (!bdisp->dbg.debugfs_entry)
-               goto err;
 
-       if (!bdisp_dbg_create_entry(regs))
-               goto err;
-
-       if (!bdisp_dbg_create_entry(last_nodes))
-               goto err;
-
-       if (!bdisp_dbg_create_entry(last_nodes_raw))
-               goto err;
-
-       if (!bdisp_dbg_create_entry(last_request))
-               goto err;
-
-       if (!bdisp_dbg_create_entry(perf))
-               goto err;
-
-       return 0;
-
-err:
-       bdisp_debugfs_remove(bdisp);
-       return -ENOMEM;
+       bdisp_dbg_create_entry(regs);
+       bdisp_dbg_create_entry(last_nodes);
+       bdisp_dbg_create_entry(last_nodes_raw);
+       bdisp_dbg_create_entry(last_request);
+       bdisp_dbg_create_entry(perf);
 }
 
 void bdisp_debugfs_remove(struct bdisp_dev *bdisp)
 
        }
 
        /* Debug */
-       ret = bdisp_debugfs_create(bdisp);
-       if (ret) {
-               dev_err(dev, "failed to create debugfs\n");
-               goto err_v4l2;
-       }
+       bdisp_debugfs_create(bdisp);
 
        /* Power management */
        pm_runtime_enable(dev);
        pm_runtime_put(dev);
 err_dbg:
        bdisp_debugfs_remove(bdisp);
-err_v4l2:
        v4l2_device_unregister(&bdisp->v4l2_dev);
 err_clk:
        if (!IS_ERR(bdisp->clock))
 
 int bdisp_hw_update(struct bdisp_ctx *ctx);
 
 void bdisp_debugfs_remove(struct bdisp_dev *bdisp);
-int bdisp_debugfs_create(struct bdisp_dev *bdisp);
+void bdisp_debugfs_create(struct bdisp_dev *bdisp);
 void bdisp_dbg_perf_begin(struct bdisp_dev *bdisp);
 void bdisp_dbg_perf_end(struct bdisp_dev *bdisp);
 
 void hva_debugfs_create(struct hva_dev *hva)
 {
        hva->dbg.debugfs_entry = debugfs_create_dir(HVA_NAME, NULL);
-       if (!hva->dbg.debugfs_entry)
-               goto err;
 
-       if (!hva_dbg_create_entry(device))
-               goto err;
-
-       if (!hva_dbg_create_entry(encoders))
-               goto err;
-
-       if (!hva_dbg_create_entry(last))
-               goto err;
-
-       if (!hva_dbg_create_entry(regs))
-               goto err;
-
-       return;
-
-err:
-       hva_debugfs_remove(hva);
+       hva_dbg_create_entry(device);
+       hva_dbg_create_entry(encoders);
+       hva_dbg_create_entry(last);
+       hva_dbg_create_entry(regs);
 }
 
 void hva_debugfs_remove(struct hva_dev *hva)