Merge branch '26-api-update-for-debugfs_create_regset32-not-handled-properly' into 'master'

Resolve "API update for debugfs_create_regset32() not handled properly" Closes #26 See merge request be-cem-edl/fec/hardware-modules/fmc-tdc-1ns-5cha!9

Merge branch '26-api-update-for-debugfs_create_regset32-not-handled-properly' into 'master'
Resolve "API update for debugfs_create_regset32() not handled properly" Closes #26 See merge request be-cem-edl/fec/hardware-modules/fmc-tdc-1ns-5cha!9
907889d0 · Federico Vaga · 711bde0f · bf952e0e · 907889d0
Commit 907889d0 authored Nov 30, 2022 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

ft-debug.c software/kernel/ft-debug.c +6 -0

No files found.
--- a/software/kernel/ft-debug.c
+++ b/software/kernel/ft-debug.c
@@ -58,14 +58,20 @@ int ft_debug_init(struct fmctdc_dev *ft)
 		ft->dbg_reg32.regs = ft_debugfs_reg32;
 		ft->dbg_reg32.nregs = ARRAY_SIZE(ft_debugfs_reg32);
 		ft->dbg_reg32.base = ft->ft_base;
+#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
 		debugfs_create_regset32("regs", 0444, ft->dbg_dir,
 					&ft->dbg_reg32);
+#else
+		ft->dbg_reg = debugfs_create_regset32("regs", 0444,
+							ft->dbg_dir,
+							&ft->dbg_reg32);
 		if (IS_ERR_OR_NULL(ft->dbg_reg)) {
 			err = PTR_ERR(ft->dbg_reg);
 			dev_warn(&ft->pdev->dev,
 				 "Cannot create debugfs file \"regs\" (%d)\n",
 				 err);
 		}
+#endif
 		break;
 	default:
 		break;