mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
|
From 6bafe07c930676d6430be471310958070816a595 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||
|
|
Date: Thu, 21 Dec 2023 18:34:20 +0100
|
||
|
|
Subject: [PATCH] nvmem: u-boot-env: improve coding style
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
1. Prefer kzalloc() over kcalloc()
|
||
|
|
See memory-allocation.rst which says: "to be on the safe side it's
|
||
|
|
best to use routines that set memory to zero, like kzalloc()"
|
||
|
|
2. Drop dev_err() for u_boot_env_add_cells() fail
|
||
|
|
It can fail only on -ENOMEM. We don't want to print error then.
|
||
|
|
3. Add extra "crc32_addr" variable
|
||
|
|
It makes code reading header's crc32 easier to understand / review.
|
||
|
|
|
||
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||
|
|
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||
|
|
Link: https://lore.kernel.org/r/20231221173421.13737-5-zajec5@gmail.com
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
drivers/nvmem/u-boot-env.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/nvmem/u-boot-env.c
|
||
|
|
+++ b/drivers/nvmem/u-boot-env.c
|
||
|
|
@@ -132,6 +132,7 @@ static int u_boot_env_parse(struct u_boo
|
||
|
|
size_t crc32_data_offset;
|
||
|
|
size_t crc32_data_len;
|
||
|
|
size_t crc32_offset;
|
||
|
|
+ __le32 *crc32_addr;
|
||
|
|
size_t data_offset;
|
||
|
|
size_t data_len;
|
||
|
|
size_t dev_size;
|
||
|
|
@@ -143,7 +144,7 @@ static int u_boot_env_parse(struct u_boo
|
||
|
|
|
||
|
|
dev_size = nvmem_dev_size(nvmem);
|
||
|
|
|
||
|
|
- buf = kcalloc(1, dev_size, GFP_KERNEL);
|
||
|
|
+ buf = kzalloc(dev_size, GFP_KERNEL);
|
||
|
|
if (!buf) {
|
||
|
|
err = -ENOMEM;
|
||
|
|
goto err_out;
|
||
|
|
@@ -175,7 +176,8 @@ static int u_boot_env_parse(struct u_boo
|
||
|
|
data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
- crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
||
|
|
+ crc32_addr = (__le32 *)(buf + crc32_offset);
|
||
|
|
+ crc32 = le32_to_cpu(*crc32_addr);
|
||
|
|
crc32_data_len = dev_size - crc32_data_offset;
|
||
|
|
data_len = dev_size - data_offset;
|
||
|
|
|
||
|
|
@@ -188,8 +190,6 @@ static int u_boot_env_parse(struct u_boo
|
||
|
|
|
||
|
|
buf[dev_size - 1] = '\0';
|
||
|
|
err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
|
||
|
|
- if (err)
|
||
|
|
- dev_err(dev, "Failed to add cells: %d\n", err);
|
||
|
|
|
||
|
|
err_kfree:
|
||
|
|
kfree(buf);
|