crypto: hisilicon - replace #ifdef with IS_ENABLED for CONFIG_NUMA (1e67ee93) · Commits · 戴 / test

drivers/crypto/hisilicon/zip/zip_main.c

+25 −26

Original line number	Diff line number	Diff line
		@@ -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,6 +113,7 @@ struct hisi_zip *find_zip_device(int node)

		mutex_lock(&hisi_zip_list_lock);

		if (IS_ENABLED(CONFIG_NUMA)) {
		list_for_each_entry(hisi_zip, &hisi_zip_list, list) {
		res = kzalloc(sizeof(*res), GFP_KERNEL);
		if (!res)
		@@ -121,7 +121,7 @@ struct hisi_zip *find_zip_device(int node)

		dev = &hisi_zip->qm.pdev->dev;
		res->hzip = hisi_zip;
		res->distance = node_distance(dev->numa_node, node);
		res->distance = node_distance(dev_to_node(dev), node);

		n = &head;
		list_for_each_entry(tmp, &head, list) {
		@@ -141,11 +141,10 @@ struct hisi_zip *find_zip_device(int node)
		}

		free_list(&head);
		#else
		mutex_lock(&hisi_zip_list_lock);

		} else {
		ret = list_first_entry(&hisi_zip_list, struct hisi_zip, list);
		#endif
		}

		mutex_unlock(&hisi_zip_list_lock);

		return ret;