2022-08-23 17:23:51

by Emmanuel Gil Peyrot

Subject: [PATCH] rtc: gamecube: Always reset HW_SRNPROT after read

This register would fail to be reset if reading the RTC bias failed for
whichever reason. This commit reorganises the code around to
unconditionally write it back to its previous value, unmap it, and
return the result of regmap_read(), which makes it both simpler and more
correct in the error case.

Signed-off-by: Emmanuel Gil Peyrot <[email protected]>
---
drivers/rtc/rtc-gamecube.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/rtc/rtc-gamecube.c b/drivers/rtc/rtc-gamecube.c
index c2717bb52b2b..c828bc8e05b9 100644
--- a/drivers/rtc/rtc-gamecube.c
+++ b/drivers/rtc/rtc-gamecube.c
@@ -265,18 +265,17 @@ static int gamecube_rtc_read_offset_from_sram(struct priv *d)
* SRAM address as on previous consoles.
*/
ret = regmap_read(d->regmap, RTC_SRAM_BIAS, &d->rtc_bias);
- if (ret) {
- pr_err("failed to get the RTC bias\n");
- iounmap(hw_srnprot);
- return -1;
- }

/* Reset SRAM access to how it was before, our job here is done. */
if (old != 0x7bf)
iowrite32be(old, hw_srnprot);
+
iounmap(hw_srnprot);

- return 0;
+ if (ret)
+ pr_err("failed to get the RTC bias\n");
+
+ return ret;
}

static const struct regmap_range rtc_rd_ranges[] = {
--
2.37.2

2022-08-23 20:41:48

by Alexandre Belloni

Subject: Re: [PATCH] rtc: gamecube: Always reset HW_SRNPROT after read

On Tue, 23 Aug 2022 15:07:02 +0200, Emmanuel Gil Peyrot wrote:
> This register would fail to be reset if reading the RTC bias failed for
> whichever reason. This commit reorganises the code around to
> unconditionally write it back to its previous value, unmap it, and
> return the result of regmap_read(), which makes it both simpler and more
> correct in the error case.
>
>
> [...]

Applied, thanks!

[1/1] rtc: gamecube: Always reset HW_SRNPROT after read
commit: 509451ac03eb3afa4c4a32d4c11b1938f08de8e4

Best regards,

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com