From: Dan Carpenter <dan.carpenter@oracle.com>
To: Mao Wenan <maowenan@huawei.com>
Cc: wangzhou1@hisilicon.com, herbert@gondor.apana.org.au,
davem@davemloft.net, tanshukun1@huawei.com,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH -next] crypto: hisilicon: move label err to #ifdef CONFIG_NUMA
Date: Tue, 5 Nov 2019 17:56:02 +0300 [thread overview]
Message-ID: <20191105145602.GH10409@kadam> (raw)
In-Reply-To: <20191105143340.32950-1-maowenan@huawei.com>
The ifdefs in this function were pretty ugly before but this makes it
super extra ugly... :/ There are bunch of ways to fix this nicely
but my favourite is this:
Feel free to give me a Suggested-by tag.
diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 255b63cfbe1d..1b22f0ead56e 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -105,20 +105,27 @@ 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 *hisi_zip;
struct list_head *n;
struct device *dev;
LIST_HEAD(head);
+ if (!IS_ENABLED(CONFIG_NUMA)) {
+ mutex_lock(&hisi_zip_list_lock);
+ ret = list_first_entry(&hisi_zip_list, struct hisi_zip, list);
+ mutex_unlock(&hisi_zip_list_lock);
+ return ret;
+ }
+
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 (!res) {
+ ret = NULL;
+ goto done;
+ }
dev = &hisi_zip->qm.pdev->dev;
res->hzip = hisi_zip;
res->distance = node_distance(dev->numa_node, node);
@@ -140,20 +147,10 @@ struct hisi_zip *find_zip_device(int node)
}
}
+done:
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;
-
-err:
- free_list(&head);
- mutex_unlock(&hisi_zip_list_lock);
- return NULL;
}
struct hisi_zip_hw_error {
next prev parent reply other threads:[~2019-11-05 14:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 14:33 [PATCH -next] crypto: hisilicon: move label err to #ifdef CONFIG_NUMA Mao Wenan
2019-11-05 14:56 ` Dan Carpenter [this message]
2019-11-06 0:50 ` Zhou Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191105145602.GH10409@kadam \
--to=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maowenan@huawei.com \
--cc=tanshukun1@huawei.com \
--cc=wangzhou1@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).