From: Heiko Stuebner <heiko@sntech.de>
To: lee@kernel.org
Cc: heiko@sntech.de, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] mfd: qnap-mcu: improve structure in qnap_mcu_exec
Date: Mon, 4 Aug 2025 15:07:26 +0200 [thread overview]
Message-ID: <20250804130726.3180806-5-heiko@sntech.de> (raw)
In-Reply-To: <20250804130726.3180806-1-heiko@sntech.de>
Now with guard(mutex) in place, we can make the function's structure
a bit easier to read, by removing the nested if-else-clauses.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/mfd/qnap-mcu.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/qnap-mcu.c b/drivers/mfd/qnap-mcu.c
index 7bc44c64b7fd..2be429a50611 100644
--- a/drivers/mfd/qnap-mcu.c
+++ b/drivers/mfd/qnap-mcu.c
@@ -150,6 +150,7 @@ int qnap_mcu_exec(struct qnap_mcu *mcu,
size_t length = reply_data_size + QNAP_MCU_CHECKSUM_SIZE;
struct qnap_mcu_reply *reply = &mcu->reply;
int ret = 0;
+ u8 crc;
if (length > sizeof(rx)) {
dev_err(&mcu->serdev->dev, "expected data too big for receive buffer");
@@ -172,18 +173,16 @@ int qnap_mcu_exec(struct qnap_mcu *mcu,
if (!wait_for_completion_timeout(&reply->done, msecs_to_jiffies(QNAP_MCU_TIMEOUT_MS))) {
dev_err(&mcu->serdev->dev, "Command timeout\n");
return -ETIMEDOUT;
- } else {
- u8 crc = qnap_mcu_csum(rx, reply_data_size);
-
- if (crc != rx[reply_data_size]) {
- dev_err(&mcu->serdev->dev,
- "Invalid Checksum received\n");
- return -EIO;
- } else {
- memcpy(reply_data, rx, reply_data_size);
- }
}
+ crc = qnap_mcu_csum(rx, reply_data_size);
+ if (crc != rx[reply_data_size]) {
+ dev_err(&mcu->serdev->dev, "Invalid Checksum received\n");
+ return -EIO;
+ }
+
+ memcpy(reply_data, rx, reply_data_size);
+
return 0;
}
EXPORT_SYMBOL_GPL(qnap_mcu_exec);
--
2.47.2
next prev parent reply other threads:[~2025-08-04 13:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-04 13:07 [PATCH 0/4] mfd: qnap-mcu: Some fixes / improvements Heiko Stuebner
2025-08-04 13:07 ` [PATCH 1/4] mfd: qnap-mcu: include linux/types.h in qnap-mcu.h shared header Heiko Stuebner
2025-08-04 13:07 ` [PATCH 2/4] mfd: qnap-mcu: handle errors returned from qnap_mcu_write Heiko Stuebner
2025-08-04 13:07 ` [PATCH 3/4] mfd: qnap-mcu: convert to guard(mutex) in qnap_mcu_exec Heiko Stuebner
2025-08-04 13:07 ` Heiko Stuebner [this message]
2025-09-02 7:58 ` [PATCH 0/4] mfd: qnap-mcu: Some fixes / improvements Lee Jones
2025-09-02 8:00 ` Lee Jones
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=20250804130726.3180806-5-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®