Skip to content

Commit eaed83f

Browse files
committed
Rename CONFIG_DEBUGFS to CONFIG_DEBUG_FS
This is the real name, unsure when we started to use the wrong one. Sponsored by: Beckhoff Automation GmbH & Co. KG
1 parent 2dc51cf commit eaed83f

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

amd/amdgpu/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ SRCS+= amd_powerplay.c \
570570
vega20_thermal.c \
571571
vegam_smumgr.c
572572

573-
.ifdef (CONFIG_DEBUGFS)
573+
.ifdef (CONFIG_DEBUG_FS)
574574
SRCS+= amdgpu_pmu.c
575575
.endif
576576

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ enum amdgpu_ras_retire_page_reservation {
7777

7878
atomic_t amdgpu_ras_in_intr = ATOMIC_INIT(0);
7979

80-
#ifdef CONFIG_DEBUGFS
80+
#ifdef CONFIG_DEBUG_FS
8181
static bool amdgpu_ras_check_bad_page(struct amdgpu_device *adev,
8282
uint64_t addr);
8383

@@ -370,7 +370,7 @@ static const struct file_operations amdgpu_ras_debugfs_eeprom_ops = {
370370
.write = amdgpu_ras_debugfs_eeprom_write,
371371
.llseek = default_llseek
372372
};
373-
#endif /* CONFIG_DEBUGFS */
373+
#endif /* CONFIG_DEBUG_FS */
374374

375375
/**
376376
* DOC: AMDGPU RAS sysfs Error Count Interface
@@ -1080,7 +1080,7 @@ static int amdgpu_ras_sysfs_remove_all(struct amdgpu_device *adev)
10801080
}
10811081
/* sysfs end */
10821082

1083-
#ifdef CONFIG_DEBUGFS
1083+
#ifdef CONFIG_DEBUG_FS
10841084
/**
10851085
* DOC: AMDGPU RAS Reboot Behavior for Unrecoverable Errors
10861086
*
@@ -1208,7 +1208,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *adev)
12081208

12091209
static int amdgpu_ras_fs_fini(struct amdgpu_device *adev)
12101210
{
1211-
#ifdef CONFIG_DEBUGFS
1211+
#ifdef CONFIG_DEBUG_FS
12121212
amdgpu_ras_debugfs_remove_all(adev);
12131213
#endif
12141214
amdgpu_ras_sysfs_remove_all(adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
591591
int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev,
592592
struct ras_common_if *head);
593593

594-
#ifdef CONFIG_DEBUGFS
594+
#ifdef CONFIG_DEBUG_FS
595595
void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
596596
struct ras_fs_if *head);
597597

drivers/gpu/drm/drm_drv.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ static const struct file_operations drm_stub_fops = {
11481148
static void drm_core_exit(void)
11491149
{
11501150
unregister_chrdev(DRM_MAJOR, "drm");
1151-
#ifdef CONFIG_DEBUGFS
1151+
#ifdef CONFIG_DEBUG_FS
11521152
debugfs_remove(drm_debugfs_root);
11531153
#endif
11541154
drm_sysfs_destroy();
@@ -1169,7 +1169,7 @@ static int __init drm_core_init(void)
11691169
goto error;
11701170
}
11711171

1172-
#ifdef CONFIG_DEBUGFS
1172+
#ifdef CONFIG_DEBUG_FS
11731173
drm_debugfs_root = debugfs_create_dir("dri", NULL);
11741174
#endif
11751175

drivers/gpu/drm/drm_os_freebsd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,6 @@ MODULE_DEPEND(drmn, pci, 1, 1, 1);
259259
MODULE_DEPEND(drmn, mem, 1, 1, 1);
260260
MODULE_DEPEND(drmn, linuxkpi, 1, 1, 1);
261261
MODULE_DEPEND(drmn, linuxkpi_gplv2, 1, 1, 1);
262-
#ifdef CONFIG_DEBUGFS
262+
#ifdef CONFIG_DEBUG_FS
263263
MODULE_DEPEND(drmn, debugfs, 1, 1, 1);
264264
#endif

drivers/gpu/drm/i915/i915_pci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ MODULE_DEPEND(i915kms, agp, 1, 1, 1);
11011101
MODULE_DEPEND(i915kms, linuxkpi, 1, 1, 1);
11021102
MODULE_DEPEND(i915kms, linuxkpi_gplv2, 1, 1, 1);
11031103
MODULE_DEPEND(i915kms, firmware, 1, 1, 1);
1104-
#ifdef CONFIG_DEBUGFS
1104+
#ifdef CONFIG_DEBUG_FS
11051105
MODULE_DEPEND(i915kms, debugfs, 1, 1, 1);
11061106
#endif
11071107
#endif

dummygfx/dummygfx_drv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ MODULE_DEPEND(dummygfx, ttm, 1, 1, 1);
5050
MODULE_DEPEND(dummygfx, agp, 1, 1, 1);
5151
MODULE_DEPEND(dummygfx, linuxkpi, 1, 1, 1);
5252
MODULE_DEPEND(dummygfx, linuxkpi_gplv2, 1, 1, 1);
53-
#ifdef CONFIG_DEBUGFS
53+
#ifdef CONFIG_DEBUG_FS
5454
MODULE_DEPEND(dummygfx, debugfs, 1, 1, 1);
5555
#endif

include/drm/drm_print.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
9191
__printf(2, 3)
9292
void drm_printf(struct drm_printer *p, const char *f, ...);
9393
void drm_puts(struct drm_printer *p, const char *str);
94-
#ifdef CONFIG_DEBUGFS
94+
#ifdef CONFIG_DEBUG_FS
9595
void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset);
9696
#endif
9797
void drm_print_bits(struct drm_printer *p, unsigned long value,

0 commit comments

Comments
 (0)