Commit bfbb9632 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hsi-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:

 - omap-ssi: remove unnecessary debugfs_create_dir() error check

* tag 'hsi-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap-ssi: Remove unnecessary debugfs_create_dir() error check
parents bdf56c75 c3eddf5e
...@@ -116,22 +116,13 @@ static int ssi_debug_add_ctrl(struct hsi_controller *ssi) ...@@ -116,22 +116,13 @@ static int ssi_debug_add_ctrl(struct hsi_controller *ssi)
/* SSI controller */ /* SSI controller */
omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL); omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL);
if (!omap_ssi->dir) debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi, &ssi_regs_fops);
return -ENOMEM;
debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi,
&ssi_regs_fops);
/* SSI GDD (DMA) */ /* SSI GDD (DMA) */
dir = debugfs_create_dir("gdd", omap_ssi->dir); dir = debugfs_create_dir("gdd", omap_ssi->dir);
if (!dir)
goto rback;
debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops); debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops);
return 0; return 0;
rback:
debugfs_remove_recursive(omap_ssi->dir);
return -ENOMEM;
} }
static void ssi_debug_remove_ctrl(struct hsi_controller *ssi) static void ssi_debug_remove_ctrl(struct hsi_controller *ssi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment