summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:27 +0200
commitefab7dbedba741db63c200a5f12f19f82178d05c (patch)
tree1df83130dde3c3b7a6b54c270c0c034eda67c614 /arch/arm/mach-imx
parentb7d1cc08cc3842697b5148d1a9d244c2c19dc834 (diff)
parent13f237e2d84c875d9f4bcbdfe513a18a269ceaee (diff)
downloadbarebox-efab7dbedba741db63c200a5f12f19f82178d05c.tar.gz
barebox-efab7dbedba741db63c200a5f12f19f82178d05c.tar.xz
Merge branch 'for-next/driver-macro' into master
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/esdctl.c7
-rw-r--r--arch/arm/mach-imx/iim.c8
2 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index cc5d3a8359..426a96a3c4 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -703,12 +703,7 @@ static struct driver_d imx_esdctl_driver = {
.of_compatible = DRV_OF_COMPAT(imx_esdctl_dt_ids),
};
-static int imx_esdctl_init(void)
-{
- return platform_driver_register(&imx_esdctl_driver);
-}
-
-mem_initcall(imx_esdctl_init);
+mem_platform_driver(imx_esdctl_driver);
/*
* The i.MX SoCs usually have two SDRAM chipselects. The following
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index 2f9ffbd271..b60c5de7e1 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -586,10 +586,4 @@ static struct driver_d imx_iim_driver = {
.of_compatible = DRV_OF_COMPAT(imx_iim_dt_ids),
};
-static int imx_iim_init(void)
-{
- platform_driver_register(&imx_iim_driver);
-
- return 0;
-}
-coredevice_initcall(imx_iim_init);
+coredevice_platform_driver(imx_iim_driver);