Skip to content

Commit 60dc45d

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull arm platform SoC code updates from Arnd Bergmann: "These are mainly code cleanups, dropping some unneeded code, plus a reference counting leak fix" * tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: at91: remove unnecessary of_platform_default_populate calls ARM: at91: Move PM init functions to .init_late hook ARM: omap1: drop unused Kconfig symbol ARM: omap2: Fix reference count leaks in omap_control_init()
2 parents bdbddf7 + 16868b3 commit 60dc45d

8 files changed

Lines changed: 18 additions & 77 deletions

File tree

‎arch/arm/mach-at91/at91rm9200.c‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@
77
* 2012 Joachim Eastwood <manabian@gmail.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411

1512
#include "generic.h"
1613

17-
static void __init at91rm9200_dt_device_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
at91rm9200_pm_init();
22-
}
23-
2414
static const char *const at91rm9200_dt_board_compat[] __initconst = {
2515
"atmel,at91rm9200",
2616
NULL
2717
};
2818

2919
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
30-
.init_machine = at91rm9200_dt_device_init,
20+
.init_late = at91rm9200_pm_init,
3121
.dt_compat = at91rm9200_dt_board_compat,
3222
MACHINE_END

‎arch/arm/mach-at91/at91sam9.c‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,18 @@
66
* 2011 Nicolas Ferre <nicolas.ferre@atmel.com>
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/mach/arch.h>
1310
#include <asm/system_misc.h>
1411

1512
#include "generic.h"
1613

17-
static void __init at91sam9_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
at91sam9_pm_init();
22-
}
23-
2414
static const char *const at91_dt_board_compat[] __initconst = {
2515
"atmel,at91sam9",
2616
NULL
2717
};
2818

2919
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
3020
/* Maintainer: Atmel */
31-
.init_machine = at91sam9_init,
21+
.init_late = at91sam9_pm_init,
3222
.dt_compat = at91_dt_board_compat,
3323
MACHINE_END

‎arch/arm/mach-at91/sam9x60.c‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,18 @@
77
* Author: Claudiu Beznea <claudiu.beznea@microchip.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411
#include <asm/system_misc.h>
1512

1613
#include "generic.h"
1714

18-
static void __init sam9x60_init(void)
19-
{
20-
of_platform_default_populate(NULL, NULL, NULL);
21-
22-
sam9x60_pm_init();
23-
}
24-
2515
static const char *const sam9x60_dt_board_compat[] __initconst = {
2616
"microchip,sam9x60",
2717
NULL
2818
};
2919

3020
DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
3121
/* Maintainer: Microchip */
32-
.init_machine = sam9x60_init,
22+
.init_late = sam9x60_pm_init,
3323
.dt_compat = sam9x60_dt_board_compat,
3424
MACHINE_END

‎arch/arm/mach-at91/sam9x7.c‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,17 @@
77
* Author: Varshini Rajendran <varshini.rajendran@microchip.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411

1512
#include "generic.h"
1613

17-
static void __init sam9x7_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
sam9x7_pm_init();
22-
}
23-
2414
static const char * const sam9x7_dt_board_compat[] __initconst = {
2515
"microchip,sam9x7",
2616
NULL
2717
};
2818

2919
DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
3020
/* Maintainer: Microchip */
31-
.init_machine = sam9x7_init,
21+
.init_late = sam9x7_pm_init,
3222
.dt_compat = sam9x7_dt_board_compat,
3323
MACHINE_END

‎arch/arm/mach-at91/sama5.c‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
* 2013 Ludovic Desroches <ludovic.desroches@atmel.com>
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/hardware/cache-l2x0.h>
1310
#include <asm/mach/arch.h>
1411
#include <asm/mach/map.h>
@@ -30,20 +27,14 @@ static void __init sama5_secure_cache_init(void)
3027
outer_cache.write_sec = sama5_l2c310_write_sec;
3128
}
3229

33-
static void __init sama5_dt_device_init(void)
34-
{
35-
of_platform_default_populate(NULL, NULL, NULL);
36-
sama5_pm_init();
37-
}
38-
3930
static const char *const sama5_dt_board_compat[] __initconst = {
4031
"atmel,sama5",
4132
NULL
4233
};
4334

4435
DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
4536
/* Maintainer: Atmel */
46-
.init_machine = sama5_dt_device_init,
37+
.init_late = sama5_pm_init,
4738
.dt_compat = sama5_dt_board_compat,
4839
MACHINE_END
4940

@@ -54,26 +45,20 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {
5445

5546
DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
5647
/* Maintainer: Atmel */
57-
.init_machine = sama5_dt_device_init,
48+
.init_late = sama5_pm_init,
5849
.dt_compat = sama5_alt_dt_board_compat,
5950
.l2c_aux_mask = ~0UL,
6051
MACHINE_END
6152

62-
static void __init sama5d2_init(void)
63-
{
64-
of_platform_default_populate(NULL, NULL, NULL);
65-
sama5d2_pm_init();
66-
}
67-
6853
static const char *const sama5d2_compat[] __initconst = {
6954
"atmel,sama5d2",
7055
NULL
7156
};
7257

7358
DT_MACHINE_START(sama5d2, "Atmel SAMA5")
7459
/* Maintainer: Atmel */
75-
.init_machine = sama5d2_init,
7660
.init_early = sama5_secure_cache_init,
61+
.init_late = sama5d2_pm_init,
7762
.dt_compat = sama5d2_compat,
7863
.l2c_aux_mask = ~0UL,
7964
MACHINE_END

‎arch/arm/mach-at91/sama7.c‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,19 @@
66
*
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/mach/arch.h>
1310
#include <asm/system_misc.h>
1411

1512
#include "generic.h"
1613

17-
static void __init sama7_dt_device_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
sama7_pm_init();
21-
}
22-
2314
static const char *const sama7_dt_board_compat[] __initconst = {
2415
"microchip,sama7",
2516
NULL
2617
};
2718

2819
DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
2920
/* Maintainer: Microchip */
30-
.init_machine = sama7_dt_device_init,
21+
.init_late = sama7_pm_init,
3122
.dt_compat = sama7_dt_board_compat,
3223
MACHINE_END
3324

‎arch/arm/mach-omap1/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ menuconfig ARCH_OMAP1
44
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5
55
depends on CPU_LITTLE_ENDIAN
66
depends on ATAGS
7-
select ARCH_HAS_HOLES_MEMORYMODEL
87
select ARCH_OMAP
98
select CLKSRC_MMIO
109
select FORCE_PCI if PCCARD

‎arch/arm/mach-omap2/control.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ int __init omap2_control_base_init(void)
732732
*/
733733
int __init omap_control_init(void)
734734
{
735-
struct device_node *np, *scm_conf;
735+
struct device_node *np, *scm_conf, *clocks_node;
736736
const struct of_device_id *match;
737737
const struct omap_prcm_init_data *data;
738738
int ret;
@@ -753,16 +753,19 @@ int __init omap_control_init(void)
753753

754754
if (IS_ERR(syscon)) {
755755
ret = PTR_ERR(syscon);
756-
goto of_node_put;
756+
goto err_put_scm_conf;
757757
}
758758

759-
if (of_get_child_by_name(scm_conf, "clocks")) {
759+
clocks_node = of_get_child_by_name(scm_conf, "clocks");
760+
if (clocks_node) {
761+
of_node_put(clocks_node);
760762
ret = omap2_clk_provider_init(scm_conf,
761763
data->index,
762764
syscon, NULL);
763765
if (ret)
764-
goto of_node_put;
766+
goto err_put_scm_conf;
765767
}
768+
of_node_put(scm_conf);
766769
} else {
767770
/* No scm_conf found, direct access */
768771
ret = omap2_clk_provider_init(np, data->index, NULL,
@@ -780,6 +783,9 @@ int __init omap_control_init(void)
780783

781784
return 0;
782785

786+
err_put_scm_conf:
787+
if (scm_conf)
788+
of_node_put(scm_conf);
783789
of_node_put:
784790
of_node_put(np);
785791
return ret;

0 commit comments

Comments
 (0)