drm/amdgpu: Mark all instances of struct drm_info_list as const

All these are compile time constand and the
drm_debugfs_create/remove_files functions take a const
pointer argument.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nils Wallménius 2016-05-02 12:46:15 -04:00 committed by Alex Deucher
parent 62250a910a
commit 06ab6832ac
8 changed files with 10 additions and 10 deletions

View File

@ -1701,12 +1701,12 @@ static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {}
* Debugfs * Debugfs
*/ */
struct amdgpu_debugfs { struct amdgpu_debugfs {
struct drm_info_list *files; const struct drm_info_list *files;
unsigned num_files; unsigned num_files;
}; };
int amdgpu_debugfs_add_files(struct amdgpu_device *adev, int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
struct drm_info_list *files, const struct drm_info_list *files,
unsigned nfiles); unsigned nfiles);
int amdgpu_debugfs_fence_init(struct amdgpu_device *adev); int amdgpu_debugfs_fence_init(struct amdgpu_device *adev);

View File

@ -2009,7 +2009,7 @@ void amdgpu_get_pcie_info(struct amdgpu_device *adev)
* Debugfs * Debugfs
*/ */
int amdgpu_debugfs_add_files(struct amdgpu_device *adev, int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
struct drm_info_list *files, const struct drm_info_list *files,
unsigned nfiles) unsigned nfiles)
{ {
unsigned i; unsigned i;

View File

@ -639,7 +639,7 @@ static int amdgpu_debugfs_gpu_reset(struct seq_file *m, void *data)
return 0; return 0;
} }
static struct drm_info_list amdgpu_debugfs_fence_list[] = { static const struct drm_info_list amdgpu_debugfs_fence_list[] = {
{"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL}, {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL},
{"amdgpu_gpu_reset", &amdgpu_debugfs_gpu_reset, 0, NULL} {"amdgpu_gpu_reset", &amdgpu_debugfs_gpu_reset, 0, NULL}
}; };

View File

@ -797,7 +797,7 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
return 0; return 0;
} }
static struct drm_info_list amdgpu_debugfs_gem_list[] = { static const struct drm_info_list amdgpu_debugfs_gem_list[] = {
{"amdgpu_gem_info", &amdgpu_debugfs_gem_info, 0, NULL}, {"amdgpu_gem_info", &amdgpu_debugfs_gem_info, 0, NULL},
}; };
#endif #endif

View File

@ -329,7 +329,7 @@ static int amdgpu_debugfs_sa_info(struct seq_file *m, void *data)
} }
static struct drm_info_list amdgpu_debugfs_sa_list[] = { static const struct drm_info_list amdgpu_debugfs_sa_list[] = {
{"amdgpu_sa_info", &amdgpu_debugfs_sa_info, 0, NULL}, {"amdgpu_sa_info", &amdgpu_debugfs_sa_info, 0, NULL},
}; };

View File

@ -1212,7 +1212,7 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data)
return 0; return 0;
} }
static struct drm_info_list amdgpu_pm_info_list[] = { static const struct drm_info_list amdgpu_pm_info_list[] = {
{"amdgpu_pm_info", amdgpu_debugfs_pm_info, 0, NULL}, {"amdgpu_pm_info", amdgpu_debugfs_pm_info, 0, NULL},
}; };
#endif #endif

View File

@ -427,7 +427,7 @@ static int r600_uvd_index = offsetof(struct amdgpu_device, uvd.ring);
static int si_vce1_index = offsetof(struct amdgpu_device, vce.ring[0]); static int si_vce1_index = offsetof(struct amdgpu_device, vce.ring[0]);
static int si_vce2_index = offsetof(struct amdgpu_device, vce.ring[1]); static int si_vce2_index = offsetof(struct amdgpu_device, vce.ring[1]);
static struct drm_info_list amdgpu_debugfs_ring_info_list[] = { static const struct drm_info_list amdgpu_debugfs_ring_info_list[] = {
{"amdgpu_ring_gfx", amdgpu_debugfs_ring_info, 0, &amdgpu_gfx_index}, {"amdgpu_ring_gfx", amdgpu_debugfs_ring_info, 0, &amdgpu_gfx_index},
{"amdgpu_ring_cp1", amdgpu_debugfs_ring_info, 0, &cayman_cp1_index}, {"amdgpu_ring_cp1", amdgpu_debugfs_ring_info, 0, &cayman_cp1_index},
{"amdgpu_ring_cp2", amdgpu_debugfs_ring_info, 0, &cayman_cp2_index}, {"amdgpu_ring_cp2", amdgpu_debugfs_ring_info, 0, &cayman_cp2_index},
@ -445,7 +445,7 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev, struct amdgpu_ri
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
unsigned i; unsigned i;
for (i = 0; i < ARRAY_SIZE(amdgpu_debugfs_ring_info_list); ++i) { for (i = 0; i < ARRAY_SIZE(amdgpu_debugfs_ring_info_list); ++i) {
struct drm_info_list *info = &amdgpu_debugfs_ring_info_list[i]; const struct drm_info_list *info = &amdgpu_debugfs_ring_info_list[i];
int roffset = *(int*)amdgpu_debugfs_ring_info_list[i].data; int roffset = *(int*)amdgpu_debugfs_ring_info_list[i].data;
struct amdgpu_ring *other = (void *)(((uint8_t*)adev) + roffset); struct amdgpu_ring *other = (void *)(((uint8_t*)adev) + roffset);
unsigned r; unsigned r;

View File

@ -1165,7 +1165,7 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
static int ttm_pl_vram = TTM_PL_VRAM; static int ttm_pl_vram = TTM_PL_VRAM;
static int ttm_pl_tt = TTM_PL_TT; static int ttm_pl_tt = TTM_PL_TT;
static struct drm_info_list amdgpu_ttm_debugfs_list[] = { static const struct drm_info_list amdgpu_ttm_debugfs_list[] = {
{"amdgpu_vram_mm", amdgpu_mm_dump_table, 0, &ttm_pl_vram}, {"amdgpu_vram_mm", amdgpu_mm_dump_table, 0, &ttm_pl_vram},
{"amdgpu_gtt_mm", amdgpu_mm_dump_table, 0, &ttm_pl_tt}, {"amdgpu_gtt_mm", amdgpu_mm_dump_table, 0, &ttm_pl_tt},
{"ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL}, {"ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL},