ARM: orion5x: Switch to new sys-off handler API

glneo · gclement · commit 4bf23b964ba0 · 2024-09-02T14:42:52.000+02:00
Kernel now supports chained power-off handlers. Use
register_platform_power_off() that registers a platform level power-off
handler. Legacy pm_power_off() will be removed once all drivers and archs
are converted to the new sys-off API.

Signed-off-by: Andrew Davis &lt;afd@ti.com&gt;
Reviewed-by: Andrew Lunn &lt;andrew@lunn.ch&gt;
Signed-off-by: Gregory CLEMENT &lt;gregory.clement@bootlin.com&gt;
diff --git a/arch/arm/mach-orion5x/board-mss2.c b/arch/arm/mach-orion5x/board-mss2.c
@@ -82,5 +82,5 @@ static void mss2_power_off(void)
 void __init mss2_init(void)
 {
 	/* register mss2 specific power-off method */
-	pm_power_off = mss2_power_off;
+	register_platform_power_off(mss2_power_off);
 }
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
@@ -700,7 +700,7 @@ static void __init dns323_init(void)
 		if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
 		    gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
 			pr_err("DNS-323: failed to setup power-off GPIO\n");
-		pm_power_off = dns323a_power_off;
+		register_platform_power_off(dns323a_power_off);
 		break;
 	case DNS323_REV_B1:
 		/* 5182 built-in SATA init */
@@ -717,7 +717,7 @@ static void __init dns323_init(void)
 		if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
 		    gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
 			pr_err("DNS-323: failed to setup power-off GPIO\n");
-		pm_power_off = dns323b_power_off;
+		register_platform_power_off(dns323b_power_off);
 		break;
 	case DNS323_REV_C1:
 		/* 5182 built-in SATA init */
@@ -727,7 +727,7 @@ static void __init dns323_init(void)
 		if (gpio_request(DNS323C_GPIO_POWER_OFF, "POWEROFF") != 0 ||
 		    gpio_direction_output(DNS323C_GPIO_POWER_OFF, 0) != 0)
 			pr_err("DNS-323: failed to setup power-off GPIO\n");
-		pm_power_off = dns323c_power_off;
+		register_platform_power_off(dns323c_power_off);
 
 		/* Now, -this- should theoretically be done by the sata_mv driver
 		 * once I figure out what's going on there. Maybe the behaviour
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -373,7 +373,7 @@ static void __init kurobox_pro_init(void)
 	i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1);
 
 	/* register Kurobox Pro specific power-off method */
-	pm_power_off = kurobox_pro_power_off;
+	register_platform_power_off(kurobox_pro_power_off);
 }
 
 #ifdef CONFIG_MACH_KUROBOX_PRO
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -238,7 +238,7 @@ static void __init mv2120_init(void)
 	if (gpio_request(MV2120_GPIO_POWER_OFF, "POWEROFF") != 0 ||
 	    gpio_direction_output(MV2120_GPIO_POWER_OFF, 1) != 0)
 		pr_err("mv2120: failed to setup power-off GPIO\n");
-	pm_power_off = mv2120_power_off;
+	register_platform_power_off(mv2120_power_off);
 }
 
 /* Warning: HP uses a wrong mach-type (=526) in their bootloader */
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
@@ -423,7 +423,7 @@ static void __init net2big_init(void)
 
 	if (gpio_request(NET2BIG_GPIO_POWER_OFF, "power-off") == 0 &&
 	    gpio_direction_output(NET2BIG_GPIO_POWER_OFF, 0) == 0)
-		pm_power_off = net2big_power_off;
+		register_platform_power_off(net2big_power_off);
 	else
 		pr_err("net2big: failed to configure power-off GPIO\n");
 
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -349,7 +349,7 @@ static void __init tsp2_init(void)
 	i2c_register_board_info(0, &tsp2_i2c_rtc, 1);
 
 	/* register Terastation Pro II specific power-off method */
-	pm_power_off = tsp2_power_off;
+	register_platform_power_off(tsp2_power_off);
 }
 
 MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
@@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)
 	i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
 
 	/* register tsx09 specific power-off method */
-	pm_power_off = qnap_tsx09_power_off;
+	register_platform_power_off(qnap_tsx09_power_off);
 }
 
 MACHINE_START(TS209, "QNAP TS-109/TS-209")
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
@@ -312,7 +312,7 @@ static void __init qnap_ts409_init(void)
 	platform_device_register(&ts409_leds);
 
 	/* register tsx09 specific power-off method */
-	pm_power_off = qnap_tsx09_power_off;
+	register_platform_power_off(qnap_tsx09_power_off);
 }
 
 MACHINE_START(TS409, "QNAP TS-409")

Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,5 @@ static void mss2_power_off(void)`
`82`	`82`	`void __init mss2_init(void)`
`83`	`83`	`{`
`84`	`84`	`/* register mss2 specific power-off method */`
`85`		`- pm_power_off = mss2_power_off;`
	`85`	`+ register_platform_power_off(mss2_power_off);`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ static void __init kurobox_pro_init(void)`
`373`	`373`	`i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1);`
`374`	`374`
`375`	`375`	`/* register Kurobox Pro specific power-off method */`
`376`		`- pm_power_off = kurobox_pro_power_off;`
	`376`	`+ register_platform_power_off(kurobox_pro_power_off);`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`#ifdef CONFIG_MACH_KUROBOX_PRO`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static void __init mv2120_init(void)`
`238`	`238`	`if (gpio_request(MV2120_GPIO_POWER_OFF, "POWEROFF") != 0 \|\|`
`239`	`239`	`gpio_direction_output(MV2120_GPIO_POWER_OFF, 1) != 0)`
`240`	`240`	`pr_err("mv2120: failed to setup power-off GPIO\n");`
`241`		`- pm_power_off = mv2120_power_off;`
	`241`	`+ register_platform_power_off(mv2120_power_off);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/* Warning: HP uses a wrong mach-type (=526) in their bootloader */`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ static void __init tsp2_init(void)`
`349`	`349`	`i2c_register_board_info(0, &tsp2_i2c_rtc, 1);`
`350`	`350`
`351`	`351`	`/* register Terastation Pro II specific power-off method */`
`352`		`- pm_power_off = tsp2_power_off;`
	`352`	`+ register_platform_power_off(tsp2_power_off);`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)`
`314`	`314`	`i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);`
`315`	`315`
`316`	`316`	`/* register tsx09 specific power-off method */`
`317`		`- pm_power_off = qnap_tsx09_power_off;`
	`317`	`+ register_platform_power_off(qnap_tsx09_power_off);`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`MACHINE_START(TS209, "QNAP TS-109/TS-209")`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ static void __init qnap_ts409_init(void)`
`312`	`312`	`platform_device_register(&ts409_leds);`
`313`	`313`
`314`	`314`	`/* register tsx09 specific power-off method */`
`315`		`- pm_power_off = qnap_tsx09_power_off;`
	`315`	`+ register_platform_power_off(qnap_tsx09_power_off);`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`MACHINE_START(TS409, "QNAP TS-409")`