Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm: clean up fault injection usage

With the proper stubs in place in linux/fault-inject.h, we can remove a
bunch of conditional compilation for CONFIG_FAULT_INJECTION=n.

Link: https://lkml.kernel.org/r/20240813121237.2382534-2-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Jani Nikula and committed by
Andrew Morton
f161cdd9 6ce2082f

-8
-2
drivers/gpu/drm/msm/msm_debugfs.c
··· 357 357 if (priv->kms && priv->kms->funcs->debugfs_init) 358 358 priv->kms->funcs->debugfs_init(priv->kms, minor); 359 359 360 - #ifdef CONFIG_FAULT_INJECTION 361 360 fault_create_debugfs_attr("fail_gem_alloc", minor->debugfs_root, 362 361 &fail_gem_alloc); 363 362 fault_create_debugfs_attr("fail_gem_iova", minor->debugfs_root, 364 363 &fail_gem_iova); 365 - #endif 366 364 } 367 365 #endif 368 366
-2
drivers/gpu/drm/msm/msm_drv.c
··· 59 59 MODULE_PARM_DESC(modeset, "Use kernel modesetting [KMS] (1=on (default), 0=disable)"); 60 60 module_param(modeset, bool, 0600); 61 61 62 - #ifdef CONFIG_FAULT_INJECTION 63 62 DECLARE_FAULT_ATTR(fail_gem_alloc); 64 63 DECLARE_FAULT_ATTR(fail_gem_iova); 65 - #endif 66 64 67 65 static int msm_drm_uninit(struct device *dev) 68 66 {
-4
drivers/gpu/drm/msm/msm_drv.h
··· 33 33 #include <drm/msm_drm.h> 34 34 #include <drm/drm_gem.h> 35 35 36 - #ifdef CONFIG_FAULT_INJECTION 37 36 extern struct fault_attr fail_gem_alloc; 38 37 extern struct fault_attr fail_gem_iova; 39 - #else 40 - # define should_fail(attr, size) 0 41 - #endif 42 38 43 39 struct msm_kms; 44 40 struct msm_gpu;