From: Marek Behún <kabel@kernel.org>
Date: Sat, 31 Aug 2024 09:20:49 +0000 (+0200)
Subject: firmware: turris-mox-rwtm: Use ALIGN() instead of hardcoding
X-Git-Tag: v6.12-rc1~187^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82944f65a0a59a44c397e3e22d592afdfb9b3074;p=thirdparty%2Fkernel%2Flinux.git

firmware: turris-mox-rwtm: Use ALIGN() instead of hardcoding

Use ALIGN(max, 4) instead of hardcoding ((max + 3) & ~3).

Signed-off-by: Marek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20240831092050.23093-16-kabel@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
index a9391705f5b4d..0c7d8c96ea17f 100644
--- a/drivers/firmware/turris-mox-rwtm.c
+++ b/drivers/firmware/turris-mox-rwtm.c
@@ -6,6 +6,7 @@
  */
 
 #include <crypto/sha2.h>
+#include <linux/align.h>
 #include <linux/armada-37xx-rwtm-mailbox.h>
 #include <linux/completion.h>
 #include <linux/container_of.h>
@@ -268,7 +269,7 @@ static int mox_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
 	msg.command = MBOX_CMD_GET_RANDOM;
 	msg.args[0] = 1;
 	msg.args[1] = rwtm->buf_phys;
-	msg.args[2] = (max + 3) & ~3;
+	msg.args[2] = ALIGN(max, 4);
 
 	if (!wait) {
 		if (!mutex_trylock(&rwtm->busy))