Re: [PATCH V1 1/4] ARM: imx: use device_initcall for imx_soc_device_init

From: Shawn Guo
Date: Tue Apr 28 2020 - 22:25:57 EST

Next message: Johannes Weiner: "Re: [PATCH v5 0/4] Charge loop device i/o to issuing cgroup"
Previous message: Lu Baolu: "Re: [PATCH 5/5] virtio: Add bounce DMA ops"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Thu, Mar 12, 2020 at 05:17:22PM +0800, peng.fan@xxxxxxx wrote:
> From: Peng Fan <peng.fan@xxxxxxx>
>
> This is preparation to move imx_soc_device_init to drivers/soc/imx/
>
> There is no reason to must put dt devices under /sys/devices/soc0,
> they could also be under /sys/devices/platform, so we could
> pass NULL as parent when calling of_platform_default_populate.
>
> Following soc-imx8.c soc-imx-scu.c using device_initcall, need
> to change return type to int type for imx_soc_device_init.
>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
> ---
> arch/arm/mach-imx/common.h | 1 -
> arch/arm/mach-imx/cpu.c | 9 +++++----
> arch/arm/mach-imx/mach-imx6q.c | 8 +-------
> arch/arm/mach-imx/mach-imx6sl.c | 8 +-------
> arch/arm/mach-imx/mach-imx6sx.c | 8 +-------
> arch/arm/mach-imx/mach-imx6ul.c | 8 +-------
> arch/arm/mach-imx/mach-imx7d.c | 6 ------
> arch/arm/mach-imx/mach-imx7ulp.c | 2 +-
> 8 files changed, 10 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
> index 5aa5796cff0e..72c3fcc32910 100644
> --- a/arch/arm/mach-imx/common.h
> +++ b/arch/arm/mach-imx/common.h
> @@ -49,7 +49,6 @@ void imx_aips_allow_unprivileged_access(const char *compat);
> int mxc_device_init(void);
> void imx_set_soc_revision(unsigned int rev);
> void imx_init_revision_from_anatop(void);
> -struct device *imx_soc_device_init(void);
> void imx6_enable_rbc(bool enable);
> void imx_gpc_check_dt(void);
> void imx_gpc_set_arm_power_in_lpm(bool power_off);
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
> index 06f8d64b65af..2df649a84697 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -83,7 +83,7 @@ void __init imx_aips_allow_unprivileged_access(
> }
> }
>
> -struct device * __init imx_soc_device_init(void)
> +static int __init imx_soc_device_init(void)
> {
> struct soc_device_attribute *soc_dev_attr;
> const char *ocotp_compat = NULL;
> @@ -97,7 +97,7 @@ struct device * __init imx_soc_device_init(void)
>
> soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
> if (!soc_dev_attr)
> - return NULL;
> + return PTR_ERR(soc_dev_attr);
>
> soc_dev_attr->family = "Freescale i.MX";
>
> @@ -219,7 +219,7 @@ struct device * __init imx_soc_device_init(void)
> if (IS_ERR(soc_dev))
> goto free_serial_number;
>
> - return soc_device_to_device(soc_dev);
> + return 0;
>
> free_serial_number:
> kfree(soc_dev_attr->serial_number);
> @@ -227,5 +227,6 @@ struct device * __init imx_soc_device_init(void)
> kfree(soc_dev_attr->revision);
> free_soc:
> kfree(soc_dev_attr);
> - return NULL;
> + return -ENOMEM;

-ENOMEM? Shouldn't it return the error code from the call where it
fails.

Shawn

> }
> +device_initcall(imx_soc_device_init);
> diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
> index 284bce1112d2..85c084a716ab 100644
> --- a/arch/arm/mach-imx/mach-imx6q.c
> +++ b/arch/arm/mach-imx/mach-imx6q.c
> @@ -245,21 +245,15 @@ static void __init imx6q_axi_init(void)
>
> static void __init imx6q_init_machine(void)
> {
> - struct device *parent;
> -
> if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
> imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
> else
> imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
> imx_get_soc_revision());
>
> - parent = imx_soc_device_init();
> - if (parent == NULL)
> - pr_warn("failed to initialize soc device\n");
> -
> imx6q_enet_phy_init();
>
> - of_platform_default_populate(NULL, NULL, parent);
> + of_platform_default_populate(NULL, NULL, NULL);
>
> imx_anatop_init();
> cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init();
> diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
> index e27a6889cc56..f6e87363d605 100644
> --- a/arch/arm/mach-imx/mach-imx6sl.c
> +++ b/arch/arm/mach-imx/mach-imx6sl.c
> @@ -45,13 +45,7 @@ static void __init imx6sl_init_late(void)
>
> static void __init imx6sl_init_machine(void)
> {
> - struct device *parent;
> -
> - parent = imx_soc_device_init();
> - if (parent == NULL)
> - pr_warn("failed to initialize soc device\n");
> -
> - of_platform_default_populate(NULL, NULL, parent);
> + of_platform_default_populate(NULL, NULL, NULL);
>
> if (cpu_is_imx6sl())
> imx6sl_fec_init();
> diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
> index d5310bf307ff..781e2a94fdd7 100644
> --- a/arch/arm/mach-imx/mach-imx6sx.c
> +++ b/arch/arm/mach-imx/mach-imx6sx.c
> @@ -63,13 +63,7 @@ static inline void imx6sx_enet_init(void)
>
> static void __init imx6sx_init_machine(void)
> {
> - struct device *parent;
> -
> - parent = imx_soc_device_init();
> - if (parent == NULL)
> - pr_warn("failed to initialize soc device\n");
> -
> - of_platform_default_populate(NULL, NULL, parent);
> + of_platform_default_populate(NULL, NULL, NULL);
>
> imx6sx_enet_init();
> imx_anatop_init();
> diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
> index 3b0e16ccd59d..e018e716735f 100644
> --- a/arch/arm/mach-imx/mach-imx6ul.c
> +++ b/arch/arm/mach-imx/mach-imx6ul.c
> @@ -55,13 +55,7 @@ static inline void imx6ul_enet_init(void)
>
> static void __init imx6ul_init_machine(void)
> {
> - struct device *parent;
> -
> - parent = imx_soc_device_init();
> - if (parent == NULL)
> - pr_warn("failed to initialize soc device\n");
> -
> - of_platform_default_populate(NULL, NULL, parent);
> + of_platform_default_populate(NULL, NULL, NULL);
> imx6ul_enet_init();
> imx_anatop_init();
> imx6ul_pm_init();
> diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
> index ebb27592a9f7..879c35929a13 100644
> --- a/arch/arm/mach-imx/mach-imx7d.c
> +++ b/arch/arm/mach-imx/mach-imx7d.c
> @@ -78,12 +78,6 @@ static inline void imx7d_enet_init(void)
>
> static void __init imx7d_init_machine(void)
> {
> - struct device *parent;
> -
> - parent = imx_soc_device_init();
> - if (parent == NULL)
> - pr_warn("failed to initialize soc device\n");
> -
> imx_anatop_init();
> imx7d_enet_init();
> }
> diff --git a/arch/arm/mach-imx/mach-imx7ulp.c b/arch/arm/mach-imx/mach-imx7ulp.c
> index 11ac71aaf965..128cf4c92aab 100644
> --- a/arch/arm/mach-imx/mach-imx7ulp.c
> +++ b/arch/arm/mach-imx/mach-imx7ulp.c
> @@ -57,7 +57,7 @@ static void __init imx7ulp_init_machine(void)
>
> mxc_set_cpu_type(MXC_CPU_IMX7ULP);
> imx7ulp_set_revision();
> - of_platform_default_populate(NULL, NULL, imx_soc_device_init());
> + of_platform_default_populate(NULL, NULL, NULL);
> }
>
> static const char *const imx7ulp_dt_compat[] __initconst = {
> --
> 2.16.4
>

Next message: Johannes Weiner: "Re: [PATCH v5 0/4] Charge loop device i/o to issuing cgroup"
Previous message: Lu Baolu: "Re: [PATCH 5/5] virtio: Add bounce DMA ops"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]