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

bfbb9632 · Linus Torvalds <[email protected]> · 2024-09-18 10:09:48 +02:00

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

Commit: bfbb96324a4a8dfd44c88f64e4e0ef8ea4ab128b
Parents: bdf56c75 · c3eddf5e

Merge commit. Changes below are compared with the first parent: bdf56c75.

Changes

1 files changed · +1 −10

File	Status	Add	Del	Content
drivers/hsi/controllers/omap_ssi_core.c	modified	+1	−10	View file

drivers/hsi/controllers/omap_ssi_core.c

View file

diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
index 3140990..15cb759 100644
--- a/drivers/hsi/controllers/omap_ssi_core.c
+++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -116,22 +116,13 @@ static int ssi_debug_add_ctrl(struct hsi_controller *ssi)
 
 	/* SSI controller */
 	omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL);
-	if (!omap_ssi->dir)
-		return -ENOMEM;
+	debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi, &ssi_regs_fops);
 
-	debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi,
-								&ssi_regs_fops);
 	/* SSI GDD (DMA) */
 	dir = debugfs_create_dir("gdd", omap_ssi->dir);
-	if (!dir)
-		goto rback;
 	debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops);
 
 	return 0;
-rback:
-	debugfs_remove_recursive(omap_ssi->dir);
-
-	return -ENOMEM;
 }
 
 static void ssi_debug_remove_ctrl(struct hsi_controller *ssi)