i.MX Soc Changes for v7.2

- Fix IIM mapping leak in imx31 revision check
 - Fix CCM node reference leak in imx3
 - Make scmi_imx_misc_ctrl_nb variable static in firmware driver
 -----BEGIN PGP SIGNATURE-----
 
 iQHFBAABCgAvFiEEJS45w2QNr0ezLVaoNF3oRQ23YkwFAmohqpsRHGZyYW5rLmxp
 QG54cC5jb20ACgkQNF3oRQ23Ykyh+wwAnFNvhRfsdg67GnX9b3RqVdQYvyye0bUM
 o9RoqoRbHQSot6przKxebxQq2X6dBjdqO0H666g35y/aVk0G3JKSw80f9tfTArMw
 Mt5077tqqep6FlgnkBZ8kia63Ej+JQVTcPcoal7+izF/qFoeXb1hSwSa+LXHzi7V
 v6wqriTtzf1LyKpPeXhsFd3a27DoT9FJh8JpQPGqJKMadvP6HQsEZRD5ImcmesQs
 Gs5hXlSVNtw8Rs8DUkJJKWEj7fpW7SqozT8WnGuQlQ6ytgXFiy1Tz5UcQQ8vzGD0
 H5LBrrsyELFQaHAoTm35fdoFOZ97Di9Zfm66B0ZIC37qPU36oJkk4psL7hmAQod8
 1RL/uhabaHHFpb2y6QZ6duIlCsJCxIwXBrTrtQs+yqdkymy9giJE7PoLq021W75j
 cjzGE59vKQX5nU+19wtLNENgFlGltOcTAc2R5ZxHLsFTJTTREDh0P4YN+cGDpdfp
 9kzBald9I091L5Jv+whpkOkahD6pBv9y
 =JAE1
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmon22IACgkQmmx57+YA
 GNmkeBAAw0y51Theso/pMwAKAq1tpiMGvhh+aJk4/mq0ZXu53WR7VGdYVW+Rizds
 DPsQMdyyTIu8Vk9ugo7zVhMOH4HVn7w77ObSbgbCx0R0NH4Lt4VxO2tWrt+PLmke
 3UEjLir3CAsdvhOfh81E4SMQMTG+gUed5DoIGx9CwKnSt2hyDeffWWg6LYY1lxTQ
 9yDdaAKH5QoNGJWfQhuMv/w3YUu+fZ7NVxZAZOk/0vQQp0bxySUZWzl3sa5Q8iz0
 XFResRcWEnGdDtqC/nboawxmuOkEpK6VRpcKKhE/wP1gRJpFLb2uftTTOILM6h7b
 SsqZRT7Ugvf0Jg7zV7nJUAv1Ejq7bSxIWgw2VwzqGxJQFsf3uFgGxwgl5ZmHSBKS
 ZC2GF5DQ4MnjSU8Tr1FgNQrFoBFN7lqk5NMiZ2n+J9+TzgQEa725VeqtBb5/66sd
 J2koJ7o5rMXWtmvX/SeSVLNUG+eHjf4vv/JbWv3fmKaEIO2EYBjK0j/Y2RIxXsCJ
 hKVqCoJ0+P7xtIh5cuI1CzSABDUWVso3wr0iny2DWUjPbqdTXT6uSMFi7BRzyLEB
 ZxtPAttt9IERPLQqg0tD9ba6Fi3zeK3WXBw+9bB0qVpBGWzg78aKxz7T6XMC09s0
 dFXTzDGe1+hqf4z58BvcxQP/YoMoeBKI4/7EHxPCHwtEEh4d0As=
 =HHEA
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-updates-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux into soc/arm

i.MX Soc Changes for v7.2

- Fix IIM mapping leak in imx31 revision check
- Fix CCM node reference leak in imx3
- Make scmi_imx_misc_ctrl_nb variable static in firmware driver

* tag 'imx-soc-updates-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux:
  ARM: imx31: Fix IIM mapping leak in revision check
  ARM: imx3: Fix CCM node reference leak
  firmware: imx: sm-misc: Make scmi_imx_misc_ctrl_nb variable static

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm/mach-imx/cpu-imx31.c

@@ -36,6 +36,7 @@ static int mx31_read_cpu_rev(void)
 	void __iomem *iim_base;
 	struct device_node *np;
 	u32 i, srev;
+	int rev = IMX_CHIP_REVISION_UNKNOWN;
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx31-iim");
 	iim_base = of_iomap(np, 0);
@@ -48,13 +49,17 @@ static int mx31_read_cpu_rev(void)
 
 	for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
 		if (srev == mx31_cpu_type[i].srev) {
+			rev = mx31_cpu_type[i].rev;
 			imx_print_silicon_rev(mx31_cpu_type[i].name,
 						mx31_cpu_type[i].rev);
-			return mx31_cpu_type[i].rev;
+			goto out;
 		}
 
 	imx_print_silicon_rev("i.MX31", IMX_CHIP_REVISION_UNKNOWN);
-	return IMX_CHIP_REVISION_UNKNOWN;
+
+out:
+	iounmap(iim_base);
+	return rev;
 }
 
 int mx31_revision(void)

arch/arm/mach-imx/mm-imx3.c

@@ -106,6 +106,7 @@ void __init imx31_init_early(void)
 	arm_pm_idle = imx31_idle;
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx31-ccm");
 	mx3_ccm_base = of_iomap(np, 0);
+	of_node_put(np);
 	BUG_ON(!mx3_ccm_base);
 }
 #endif /* ifdef CONFIG_SOC_IMX31 */
@@ -143,6 +144,7 @@ void __init imx35_init_early(void)
 	arch_ioremap_caller = imx3_ioremap_caller;
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx35-ccm");
 	mx3_ccm_base = of_iomap(np, 0);
+	of_node_put(np);
 	BUG_ON(!mx3_ccm_base);
 }
 #endif /* ifdef CONFIG_SOC_IMX35 */

drivers/firmware/imx/sm-misc.c

@@ -16,7 +16,7 @@
 
 static const struct scmi_imx_misc_proto_ops *imx_misc_ctrl_ops;
 static struct scmi_protocol_handle *ph;
-struct notifier_block scmi_imx_misc_ctrl_nb;
+static struct notifier_block scmi_imx_misc_ctrl_nb;
 
 int scmi_imx_misc_ctrl_set(u32 id, u32 val)
 {