korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 23:54:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: hisilicon - replace #ifdef with IS_ENABLED for CONFIG_NUMA

Browse Source 
Replace #ifdef CONFIG_NUMA with IS_ENABLED(CONFIG_NUMA) to fix kbuild error.

Fixes: 700f7d0d29 ("crypto: hisilicon - fix to return...")
Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
Reported-by: kbuild test robot <lkp@intel.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Zhou Wang 2019-11-01 20:21:49 +08:00 committed by Herbert Xu
parent 44eff4ad18
commit 1e67ee9344
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/crypto/hisilicon/zip/zip_main.c
View File

@ -104,9 +104,8 @@ static void free_list(struct list_head *head)
struct hisi_zip *find_zip_device(int node)
{
struct hisi_zip *ret = NULL;
#ifdef CONFIG_NUMA
struct hisi_zip_resource *res, *tmp;
struct hisi_zip *ret = NULL;
struct hisi_zip *hisi_zip;
struct list_head *n;
struct device *dev;
@ -114,38 +113,38 @@ struct hisi_zip *find_zip_device(int node)
mutex_lock(&hisi_zip_list_lock);
list_for_each_entry(hisi_zip, &hisi_zip_list, list) {
res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res)
goto err;
if (IS_ENABLED(CONFIG_NUMA)) {
list_for_each_entry(hisi_zip, &hisi_zip_list, list) {
res = kzalloc(sizeof(*res), GFP_KERNEL);
if (!res)
goto err;
dev = &hisi_zip->qm.pdev->dev;
res->hzip = hisi_zip;
res->distance = node_distance(dev->numa_node, node);
dev = &hisi_zip->qm.pdev->dev;
res->hzip = hisi_zip;
res->distance = node_distance(dev_to_node(dev), node);
n = &head;
list_for_each_entry(tmp, &head, list) {
if (res->distance < tmp->distance) {
n = &tmp->list;
break;
}
}
list_add_tail(&res->list, n);
}
n = &head;
list_for_each_entry(tmp, &head, list) {
if (res->distance < tmp->distance) {
n = &tmp->list;
if (hisi_qm_get_free_qp_num(&tmp->hzip->qm)) {
ret = tmp->hzip;
break;
}
}
list_add_tail(&res->list, n);
free_list(&head);
} else {
ret = list_first_entry(&hisi_zip_list, struct hisi_zip, list);
}
list_for_each_entry(tmp, &head, list) {
if (hisi_qm_get_free_qp_num(&tmp->hzip->qm)) {
ret = tmp->hzip;
break;
}
}
free_list(&head);
#else
mutex_lock(&hisi_zip_list_lock);
ret = list_first_entry(&hisi_zip_list, struct hisi_zip, list);
#endif
mutex_unlock(&hisi_zip_list_lock);
return ret;