Commit 3da8d717 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Sebastian Reichel
Browse files

power: reset: rmobile-reset: Make sysc_base2 local 



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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/35f04935c48ae55dc562071e0a1d6fca65234a58.1708944642.git.geert+renesas@glider.be


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 7b46b609

drivers/power/reset/rmobile-reset.c

+4 −3
Original line number Diff line number Diff line
@@ -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);