diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1286-drm-amdkfd-Remove-usage-of-alloc-sizeof-struct.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/1286-drm-amdkfd-Remove-usage-of-alloc-sizeof-struct.patch | 189 |
1 files changed, 189 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1286-drm-amdkfd-Remove-usage-of-alloc-sizeof-struct.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1286-drm-amdkfd-Remove-usage-of-alloc-sizeof-struct.patch new file mode 100644 index 00000000..c572f966 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1286-drm-amdkfd-Remove-usage-of-alloc-sizeof-struct.patch @@ -0,0 +1,189 @@ +From 2909b880f1d333ffa9c38bc7736997f29738b646 Mon Sep 17 00:00:00 2001 +From: Kent Russell <kent.russell@amd.com> +Date: Thu, 5 Jan 2017 11:00:19 -0500 +Subject: [PATCH 1286/4131] drm/amdkfd: Remove usage of alloc(sizeof(struct... + +See https://kernel.org/doc/html/latest/process/coding-style.html +under "14) Allocating Memory" for rationale behind removing the +x=alloc(sizeof(struct) style and using x=alloc(sizeof(*x) instead + +Change-Id: If2165f07f915ea9cbfb9f43359550a32ea404b3e +Signed-off-by: Kent Russell <kent.russell@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 ++-- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 ++-- + drivers/gpu/drm/amd/amdkfd/kfd_ipc.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_peerdirect.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 10 +++++----- + 10 files changed, 16 insertions(+), 16 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 7ff9107..3d8fb00 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -694,7 +694,7 @@ static int register_process(struct device_queue_manager *dqm, + + BUG_ON(!dqm || !qpd); + +- n = kzalloc(sizeof(struct device_process_node), GFP_KERNEL); ++ n = kzalloc(sizeof(*n), GFP_KERNEL); + if (!n) + return -ENOMEM; + +@@ -1564,7 +1564,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) + + pr_debug("Loading device queue manager\n"); + +- dqm = kzalloc(sizeof(struct device_queue_manager), GFP_KERNEL); ++ dqm = kzalloc(sizeof(*dqm), GFP_KERNEL); + if (!dqm) + return NULL; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +index bad7e6e..85de9b5 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +@@ -136,7 +136,7 @@ static bool allocate_signal_page(struct file *devkfd, struct kfd_process *p) + unsigned int slot; + int i; + +- page = kzalloc(sizeof(struct signal_page), GFP_KERNEL); ++ page = kzalloc(sizeof(*page), GFP_KERNEL); + if (!page) + goto fail_alloc_signal_page; + +@@ -204,7 +204,7 @@ allocate_signal_page_dgpu(struct kfd_process *p, + { + struct signal_page *my_page; + +- my_page = kzalloc(sizeof(struct signal_page), GFP_KERNEL); ++ my_page = kzalloc(sizeof(*my_page), GFP_KERNEL); + if (!my_page) + return false; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_ipc.c b/drivers/gpu/drm/amd/amdkfd/kfd_ipc.c +index 18109d7..1b7d7cd 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_ipc.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_ipc.c +@@ -45,7 +45,7 @@ static int ipc_store_insert(void *val, void *sh, struct kfd_ipc_obj **ipc_obj) + { + struct kfd_ipc_obj *obj; + +- obj = kmalloc(sizeof(struct kfd_ipc_obj), GFP_KERNEL); ++ obj = kmalloc(sizeof(*obj), GFP_KERNEL); + if (!obj) + return -ENOMEM; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +index eb322e0..17c4a71 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -333,7 +333,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, + + BUG_ON(!dev); + +- kq = kzalloc(sizeof(struct kernel_queue), GFP_KERNEL); ++ kq = kzalloc(sizeof(*kq), GFP_KERNEL); + if (!kq) + return NULL; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +index 894f303..5ada92a 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +@@ -502,7 +502,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, + BUG_ON(!dev); + BUG_ON(type >= KFD_MQD_TYPE_MAX); + +- mqd = kzalloc(sizeof(struct mqd_manager), GFP_NOIO); ++ mqd = kzalloc(sizeof(*mqd), GFP_NOIO); + if (!mqd) + return NULL; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +index c555066..7327cda 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +@@ -453,7 +453,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, + if (WARN_ON(type >= KFD_MQD_TYPE_MAX)) + return NULL; + +- mqd = kzalloc(sizeof(struct mqd_manager), GFP_NOIO); ++ mqd = kzalloc(sizeof(*mqd), GFP_NOIO); + if (!mqd) + return NULL; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +index 39ff448..80e3e0e 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +@@ -476,7 +476,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, + BUG_ON(!dev); + BUG_ON(type >= KFD_MQD_TYPE_MAX); + +- mqd = kzalloc(sizeof(struct mqd_manager), GFP_NOIO); ++ mqd = kzalloc(sizeof(*mqd), GFP_NOIO); + if (!mqd) + return NULL; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_peerdirect.c b/drivers/gpu/drm/amd/amdkfd/kfd_peerdirect.c +index fa22d47..dac349b 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_peerdirect.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_peerdirect.c +@@ -204,7 +204,7 @@ static int amd_acquire(unsigned long addr, size_t size, + pr_debug("GPU address\n"); + + /* Initialize context used for operation with given address */ +- mem_context = kzalloc(sizeof(struct amd_mem_context), GFP_KERNEL); ++ mem_context = kzalloc(sizeof(*mem_context), GFP_KERNEL); + + if (!mem_context) + return 0; /* Error case handled as not GPU address */ +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +index 7315399..9fbcb63 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +@@ -203,7 +203,7 @@ int pqm_create_queue(struct process_queue_manager *pqm, + list_empty(&pdd->qpd.priv_queue_list)) + dev->dqm->ops.register_process(dev->dqm, &pdd->qpd); + +- pqn = kzalloc(sizeof(struct process_queue_node), GFP_KERNEL); ++ pqn = kzalloc(sizeof(*pqn), GFP_KERNEL); + if (!pqn) { + retval = -ENOMEM; + goto err_allocate_pqn; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c +index 0ab1970..5ad9f6f 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c +@@ -65,17 +65,17 @@ void print_queue(struct queue *q) + + int init_queue(struct queue **q, const struct queue_properties *properties) + { +- struct queue *tmp; ++ struct queue *tmp_q; + + BUG_ON(!q); + +- tmp = kzalloc(sizeof(struct queue), GFP_KERNEL); +- if (!tmp) ++ tmp_q = kzalloc(sizeof(*tmp_q), GFP_KERNEL); ++ if (!tmp_q) + return -ENOMEM; + +- memcpy(&tmp->properties, properties, sizeof(struct queue_properties)); ++ memcpy(&tmp_q->properties, properties, sizeof(*properties)); + +- *q = tmp; ++ *q = tmp_q; + return 0; + } + +-- +2.7.4 + |