[PATCH 2/2] ARM: Arria10: xload: don't check writel return value
Ahmad Fatoum
a.fatoum at barebox.org
Sun Jun 1 23:20:20 PDT 2025
No one checks a10_update_bits()'s return value, which is good as
return value has no indication over operation success anyway.
Make it void and fix this.
Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
---
arch/arm/mach-socfpga/arria10-xload.c | 7 ++-----
include/mach/socfpga/arria10-xload.h | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-socfpga/arria10-xload.c b/arch/arm/mach-socfpga/arria10-xload.c
index fb87135ca94a..4c8f9c7f0e55 100644
--- a/arch/arm/mach-socfpga/arria10-xload.c
+++ b/arch/arm/mach-socfpga/arria10-xload.c
@@ -16,20 +16,17 @@
#include <mach/socfpga/generic.h>
#include <linux/sizes.h>
-int a10_update_bits(unsigned int reg, unsigned int mask,
+void a10_update_bits(unsigned int reg, unsigned int mask,
unsigned int val)
{
unsigned int tmp, orig;
- int ret = 0;
orig = readl(ARRIA10_FPGAMGRREGS_ADDR + reg);
tmp = orig & ~mask;
tmp |= val & mask;
if (tmp != orig)
- ret = writel(tmp, ARRIA10_FPGAMGRREGS_ADDR + reg);
-
- return ret;
+ writel(tmp, ARRIA10_FPGAMGRREGS_ADDR + reg);
}
static uint32_t socfpga_a10_fpga_read_stat(void)
diff --git a/include/mach/socfpga/arria10-xload.h b/include/mach/socfpga/arria10-xload.h
index c58ab7f8cfd2..b7f100d90a96 100644
--- a/include/mach/socfpga/arria10-xload.h
+++ b/include/mach/socfpga/arria10-xload.h
@@ -6,7 +6,7 @@
void arria10_init_mmc(void);
int arria10_prepare_mmc(int barebox_part, int rbf_part);
int arria10_read_blocks(void *dst, int blocknum, size_t len);
-int a10_update_bits(unsigned int reg, unsigned int mask, unsigned int val);
+void a10_update_bits(unsigned int reg, unsigned int mask, unsigned int val);
struct partition {
uint64_t first_sec;
--
2.39.5
More information about the barebox
mailing list