Skip to contentSkip to conversation

ARM: imx: src: Use postcore_platform_driver() macro

PATCH Applied Alexander Shiyan 3 participants 7 messages Jun 28, 2022 – Jul 1, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: imx: src: Use postcore_platform_driver() macro

---
 arch/arm/mach-imx/src.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm/mach-imx/src.c +1 -6
index 8272d5b720..8366397e10 100644
@@ -43,9 +43,4 @@ static struct driver_d imx_src_reset_driver = {
 	.probe	= imx_src_reset_probe,
 	.of_compatible	= DRV_OF_COMPAT(imx_src_dt_ids),
 };
-
-static int imx_src_reset_init(void)
-{
-	return platform_driver_register(&imx_src_reset_driver);
-}
-postcore_initcall(imx_src_reset_init);
+postcore_platform_driver(imx_src_reset_driver);
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/1 drivers: firmware: arm-scmi: Use core_platform_driver() macro

---
 drivers/firmware/arm_scmi/driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/arm_scmi/driver.c +1 -6
index ef3d76b3f4..ad91a60e0c 100644
@@ -1252,6 +1252,7 @@ static struct driver_d scmi_driver = {
 	.of_compatible = scmi_of_match,
 	.probe = scmi_probe,
 };
+core_platform_driver(scmi_driver);
 
 static int __init scmi_bus_driver_init(void)
 {
@@ -1267,12 +1268,6 @@ static int __init scmi_bus_driver_init(void)
 }
 pure_initcall(scmi_bus_driver_init);
 
-static int __init scmi_platform_driver_init(void)
-{
-	return platform_driver_register(&scmi_driver);
-}
-core_initcall(scmi_platform_driver_init);
-
 MODULE_ALIAS("platform: arm-scmi");
 MODULE_AUTHOR("Sudeep Holla <[email protected]>");
 MODULE_DESCRIPTION("ARM SCMI protocol driver");
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] drivers: firmware: arm-scmi: Use core_platform_driver() macro

Quoted 1 line · Alexander Shiyan
Quoted 29 lines
---
 drivers/firmware/arm_scmi/driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/arm_scmi/driver.c +1 -6
index ef3d76b3f4..ad91a60e0c 100644
@@ -1252,6 +1252,7 @@ static struct driver_d scmi_driver = {
 	.of_compatible = scmi_of_match,
 	.probe = scmi_probe,
 };
+core_platform_driver(scmi_driver);
 
 static int __init scmi_bus_driver_init(void)
 {
@@ -1267,12 +1268,6 @@ static int __init scmi_bus_driver_init(void)
 }
 pure_initcall(scmi_bus_driver_init);
 
-static int __init scmi_platform_driver_init(void)
-{
-	return platform_driver_register(&scmi_driver);
-}
-core_initcall(scmi_platform_driver_init);
-
 MODULE_ALIAS("platform: arm-scmi");
 MODULE_AUTHOR("Sudeep Holla <[email protected]>");
 MODULE_DESCRIPTION("ARM SCMI protocol driver");
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#3 lore raw

Re: [PATCH] drivers: firmware: arm-scmi: Use core_platform_driver() macro

In reply to Alexander Shiyan
Quoted 10 lines · Alexander Shiyan
---
 drivers/firmware/arm_scmi/driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/arm_scmi/driver.c +0 -0
index ef3d76b3f4..ad91a60e0c 100644

drivers/firmware/arm_scmi/driver.c static struct driver_d scmi_driver = { · line 1255

Quoted 4 lines
drivers/firmware/arm_scmi/driver.c +1 -0
@@ -1252,6 +1252,7 @@ static struct driver_d scmi_driver = {
 	.of_compatible = scmi_of_match,
 	.probe = scmi_probe,
 };
+core_platform_driver(scmi_driver);

Had to drop this one as well. The core_platform_driver macro expands to an initcall named drv##_register which becomes scmi_driver_register, but that function already exists in include/linux/scmi_protocol.h.

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#4 lore raw

Re: [PATCH] drivers: firmware: arm-scmi: Use core_platform_driver() macro

Can this struct be renamed to arm_scmi_driver?

чт, 30 июн. 2022 г. в 21:58, Sascha Hauer <[email protected]>:

Quoted 28 lines · Alexander Shiyan
Quoted 10 lines
---
 drivers/firmware/arm_scmi/driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/arm_scmi/driver.c +0 -0
index ef3d76b3f4..ad91a60e0c 100644

drivers/firmware/arm_scmi/driver.c static struct driver_d scmi_driver = { · line 1255

Quoted 4 lines
drivers/firmware/arm_scmi/driver.c +1 -0
@@ -1252,6 +1252,7 @@ static struct driver_d scmi_driver = {
      .of_compatible = scmi_of_match,
      .probe = scmi_probe,
 };
+core_platform_driver(scmi_driver);

Had to drop this one as well. The core_platform_driver macro expands to an initcall named drv##_register which becomes scmi_driver_register, but that function already exists in include/linux/scmi_protocol.h.

Sascha

--

Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#5 lore raw

Re: [PATCH] drivers: firmware: arm-scmi: Use core_platform_driver() macro

Quoted 23 lines · Alexander Shiyan

Can this struct be renamed to arm_scmi_driver?

чт, 30 июн. 2022 г. в 21:58, Sascha Hauer <[email protected]>:

Quoted 20 lines · Alexander Shiyan
Quoted 10 lines
---
 drivers/firmware/arm_scmi/driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/arm_scmi/driver.c +0 -0
index ef3d76b3f4..ad91a60e0c 100644

drivers/firmware/arm_scmi/driver.c static struct driver_d scmi_driver = { · line 1255

Quoted 4 lines
drivers/firmware/arm_scmi/driver.c +1 -0
@@ -1252,6 +1252,7 @@ static struct driver_d scmi_driver = {
      .of_compatible = scmi_of_match,
      .probe = scmi_probe,
 };
+core_platform_driver(scmi_driver);

Had to drop this one as well. The core_platform_driver macro expands to an initcall named drv##_register which becomes scmi_driver_register, but that function already exists in include/linux/scmi_protocol.h.

Did that. I considered adding some underscores to the function names in register_driver_macro, but that would show up in the trace initcalls functionality which doesn't make that output nicer.

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
Applied
#6 lore raw
In reply to Alexander Shiyan
Quoted 4 lines · Alexander Shiyan
---
 arch/arm/mach-imx/src.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Applied, thanks

Sascha

Quoted 21 lines
arch/arm/mach-imx/src.c +1 -6
index 8272d5b720..8366397e10 100644
@@ -43,9 +43,4 @@ static struct driver_d imx_src_reset_driver = {
 	.probe	= imx_src_reset_probe,
 	.of_compatible	= DRV_OF_COMPAT(imx_src_dt_ids),
 };
-
-static int imx_src_reset_init(void)
-{
-	return platform_driver_register(&imx_src_reset_driver);
-}
-postcore_initcall(imx_src_reset_init);
+postcore_platform_driver(imx_src_reset_driver);
Signature · 1 line
2.32.0
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |