power: reset: rmobile-reset: Make sysc_base2 local

Commit Message

Geert Uytterhoeven Feb. 26, 2024, 10:54 a.m. UTC

The static global variable sysc_base2 is no longer used outside the
probe method and the reset handler, so it can be converted to a local
variable, and passed to the reset handler via its callback data.

Signed-off-by: Geert Uytterhoeven <[e-mail]>
---
Depends on commits 0867276eb12230a5 ("power: reset: rmobile-reset: Use
devm_platform_ioremap_resource() helper") and ba1188ea8be80a7b ("power:
reset: rmobile-reset: Use devm_register_sys_off_handler(RESTART)") in
battery/for-next (next-20240214 and later).
---
 drivers/power/reset/rmobile-reset.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Sebastian Reichel Feb. 26, 2024, 2:12 p.m. UTC | #1

On Mon, 26 Feb 2024 11:54:52 +0100, Geert Uytterhoeven wrote:
> The static global variable sysc_base2 is no longer used outside the
> probe method and the reset handler, so it can be converted to a local
> variable, and passed to the reset handler via its callback data.
> 
> 

Applied, thanks!

[1/1] power: reset: rmobile-reset: Make sysc_base2 local
      commit: 3da8d71754d3c1aa0b72d74c8a324a4bc7fab473

Best regards,

Patch

diff --git a/drivers/power/reset/rmobile-reset.c b/drivers/power/reset/rmobile-reset.c
index 14682cd59e618d5f..7dbc51c32b0eb4b0 100644
--- a/drivers/power/reset/rmobile-reset.c
+++ b/drivers/power/reset/rmobile-reset.c
@@ -19,10 +19,10 @@ 
 /* Reset Control Register 2 */
 #define RESCNT2_PRES	0x80000000	/* Soft power-on reset */
 
-static void __iomem *sysc_base2;
-
 static int rmobile_reset_handler(struct sys_off_data *data)
 {
+	void __iomem *sysc_base2 = (void __iomem *)data->cb_data;
+
 	/* Let's assume we have acquired the HPB semaphore */
 	writel(RESCNT2_PRES, sysc_base2 + RESCNT2);
 
@@ -31,6 +31,7 @@  static int rmobile_reset_handler(struct sys_off_data *data)
 
 static int rmobile_reset_probe(struct platform_device *pdev)
 {
+	void __iomem *sysc_base2;
 	int error;
 
 	sysc_base2 = devm_platform_ioremap_resource(pdev, 1);
@@ -41,7 +42,7 @@  static int rmobile_reset_probe(struct platform_device *pdev)
 					      SYS_OFF_MODE_RESTART,
 					      SYS_OFF_PRIO_HIGH,
 					      rmobile_reset_handler,
-					      NULL);
+					      (__force void *)sysc_base2);
 	if (error) {
 		dev_err(&pdev->dev,
 			"cannot register restart handler (err=%d)\n", error);