diff options
author | Yong Zhao <yong.zhao@amd.com> | 2017-09-20 18:10:20 -0400 |
---|---|---|
committer | Oded Gabbay <oded.gabbay@gmail.com> | 2017-09-20 18:10:20 -0400 |
commit | 58dcd5bfcf99c9222a825ca67a0ecbd75516ec3f (patch) | |
tree | 0b05e06229f42eeb420ba91cacb9958ee47e5322 | |
parent | e596b90338126d08a8d90f08e79bb644b8c9f2b6 (diff) |
drm/amdkfd: Drop _nocpsch suffix from shared functions
Several functions in DQM are shared between cpsch and nocpsch code.
Remove the misleading _nocpsch suffix from their names.
Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index fe0f0de0ef86..471b34e58225 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | |||
@@ -386,7 +386,7 @@ out_unlock: | |||
386 | return retval; | 386 | return retval; |
387 | } | 387 | } |
388 | 388 | ||
389 | static struct mqd_manager *get_mqd_manager_nocpsch( | 389 | static struct mqd_manager *get_mqd_manager( |
390 | struct device_queue_manager *dqm, enum KFD_MQD_TYPE type) | 390 | struct device_queue_manager *dqm, enum KFD_MQD_TYPE type) |
391 | { | 391 | { |
392 | struct mqd_manager *mqd; | 392 | struct mqd_manager *mqd; |
@@ -407,7 +407,7 @@ static struct mqd_manager *get_mqd_manager_nocpsch( | |||
407 | return mqd; | 407 | return mqd; |
408 | } | 408 | } |
409 | 409 | ||
410 | static int register_process_nocpsch(struct device_queue_manager *dqm, | 410 | static int register_process(struct device_queue_manager *dqm, |
411 | struct qcm_process_device *qpd) | 411 | struct qcm_process_device *qpd) |
412 | { | 412 | { |
413 | struct device_process_node *n; | 413 | struct device_process_node *n; |
@@ -431,7 +431,7 @@ static int register_process_nocpsch(struct device_queue_manager *dqm, | |||
431 | return retval; | 431 | return retval; |
432 | } | 432 | } |
433 | 433 | ||
434 | static int unregister_process_nocpsch(struct device_queue_manager *dqm, | 434 | static int unregister_process(struct device_queue_manager *dqm, |
435 | struct qcm_process_device *qpd) | 435 | struct qcm_process_device *qpd) |
436 | { | 436 | { |
437 | int retval; | 437 | int retval; |
@@ -513,7 +513,7 @@ static int initialize_nocpsch(struct device_queue_manager *dqm) | |||
513 | return 0; | 513 | return 0; |
514 | } | 514 | } |
515 | 515 | ||
516 | static void uninitialize_nocpsch(struct device_queue_manager *dqm) | 516 | static void uninitialize(struct device_queue_manager *dqm) |
517 | { | 517 | { |
518 | int i; | 518 | int i; |
519 | 519 | ||
@@ -1095,10 +1095,10 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) | |||
1095 | dqm->ops.stop = stop_cpsch; | 1095 | dqm->ops.stop = stop_cpsch; |
1096 | dqm->ops.destroy_queue = destroy_queue_cpsch; | 1096 | dqm->ops.destroy_queue = destroy_queue_cpsch; |
1097 | dqm->ops.update_queue = update_queue; | 1097 | dqm->ops.update_queue = update_queue; |
1098 | dqm->ops.get_mqd_manager = get_mqd_manager_nocpsch; | 1098 | dqm->ops.get_mqd_manager = get_mqd_manager; |
1099 | dqm->ops.register_process = register_process_nocpsch; | 1099 | dqm->ops.register_process = register_process; |
1100 | dqm->ops.unregister_process = unregister_process_nocpsch; | 1100 | dqm->ops.unregister_process = unregister_process; |
1101 | dqm->ops.uninitialize = uninitialize_nocpsch; | 1101 | dqm->ops.uninitialize = uninitialize; |
1102 | dqm->ops.create_kernel_queue = create_kernel_queue_cpsch; | 1102 | dqm->ops.create_kernel_queue = create_kernel_queue_cpsch; |
1103 | dqm->ops.destroy_kernel_queue = destroy_kernel_queue_cpsch; | 1103 | dqm->ops.destroy_kernel_queue = destroy_kernel_queue_cpsch; |
1104 | dqm->ops.set_cache_memory_policy = set_cache_memory_policy; | 1104 | dqm->ops.set_cache_memory_policy = set_cache_memory_policy; |
@@ -1110,11 +1110,11 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) | |||
1110 | dqm->ops.create_queue = create_queue_nocpsch; | 1110 | dqm->ops.create_queue = create_queue_nocpsch; |
1111 | dqm->ops.destroy_queue = destroy_queue_nocpsch; | 1111 | dqm->ops.destroy_queue = destroy_queue_nocpsch; |
1112 | dqm->ops.update_queue = update_queue; | 1112 | dqm->ops.update_queue = update_queue; |
1113 | dqm->ops.get_mqd_manager = get_mqd_manager_nocpsch; | 1113 | dqm->ops.get_mqd_manager = get_mqd_manager; |
1114 | dqm->ops.register_process = register_process_nocpsch; | 1114 | dqm->ops.register_process = register_process; |
1115 | dqm->ops.unregister_process = unregister_process_nocpsch; | 1115 | dqm->ops.unregister_process = unregister_process; |
1116 | dqm->ops.initialize = initialize_nocpsch; | 1116 | dqm->ops.initialize = initialize_nocpsch; |
1117 | dqm->ops.uninitialize = uninitialize_nocpsch; | 1117 | dqm->ops.uninitialize = uninitialize; |
1118 | dqm->ops.set_cache_memory_policy = set_cache_memory_policy; | 1118 | dqm->ops.set_cache_memory_policy = set_cache_memory_policy; |
1119 | break; | 1119 | break; |
1120 | default: | 1120 | default: |