Merge tag 'v5.2-rockchip-soc32-1' of... (a842b514) · Commits · 戴 / test

Merge tag 'v5.2-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/soc Missing of_node_put and some added __init contants. * tag 'v5.2-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip : ARM: rockchip: add missing of_node_put in rockchip_smp_prepare_pmu ARM: rockchip: Mark pm-init functions __init Signed-off-by:

arch/arm/mach-rockchip/platsmp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ static int __init rockchip_smp_prepare_pmu(void)
		}

		pmu_base = of_iomap(node, 0);
		of_node_put(node);
		if (!pmu_base) {
		pr_err("%s: could not map pmu registers\n", __func__);
		return -ENOMEM;

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static inline u32 rk3288_l2_config(void)
		return l2ctlr;
		}

		static void rk3288_config_bootdata(void)
		static void __init rk3288_config_bootdata(void)
		{
		rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8);
		rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume);
		@@ -230,7 +230,7 @@ static void rk3288_suspend_finish(void)
		pr_err("%s: Suspend finish failed\n", __func__);
		}

		static int rk3288_suspend_init(struct device_node *np)
		static int __init rk3288_suspend_init(struct device_node *np)
		{
		struct device_node *sram_np;
		struct resource res;