Merge tag 'v5.2-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/soc

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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: Olof Johansson <olof@lixom.net>

Olof Johansson 7 years ago a842b514 ffb832b4

+3 -2

2 changed files

expand all

arch

arm

mach-rockchip

platsmp.c

pm.c

arch/arm/mach-rockchip/platsmp.c

··· 245 245 } 246 246 247 247 pmu_base = of_iomap(node, 0); 248 + of_node_put(node); 248 249 if (!pmu_base) { 249 250 pr_err("%s: could not map pmu registers\n", __func__); 250 251 return -ENOMEM;

+2 -2

arch/arm/mach-rockchip/pm.c

··· 59 59 return l2ctlr; 60 60 } 61 61 62 - static void rk3288_config_bootdata(void) 62 + static void __init rk3288_config_bootdata(void) 63 63 { 64 64 rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8); 65 65 rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume); ··· 230 230 pr_err("%s: Suspend finish failed\n", __func__); 231 231 } 232 232 233 - static int rk3288_suspend_init(struct device_node *np) 233 + static int __init rk3288_suspend_init(struct device_node *np) 234 234 { 235 235 struct device_node *sram_np; 236 236 struct resource res;