Skip to content

Commit

Permalink
ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt
Browse files Browse the repository at this point in the history
Now that r8a7740_add_standard_devices_dt() is simply a wrapper
for a call to of_platform_populate() remove it and call
of_platform_populate() directly.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Simon Horman committed Aug 23, 2014
1 parent 5ebb4e8 commit 4333067
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-shmobile/r8a7740.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ extern void r8a7740_init_irq_of(void);
extern void r8a7740_map_io(void);
extern void r8a7740_add_early_devices(void);
extern void r8a7740_add_standard_devices(void);
extern void r8a7740_add_standard_devices_dt(void);
extern void r8a7740_clock_init(u8 md_ck);
extern void r8a7740_pinmux_init(void);
extern void r8a7740_pm_init(void);
Expand Down
7 changes: 1 addition & 6 deletions arch/arm/mach-shmobile/setup-r8a7740.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,11 +781,6 @@ void __init r8a7740_add_early_devices(void)

#ifdef CONFIG_USE_OF

void __init r8a7740_add_standard_devices_dt(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}

void __init r8a7740_init_irq_of(void)
{
void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
Expand Down Expand Up @@ -819,7 +814,7 @@ void __init r8a7740_init_irq_of(void)
static void __init r8a7740_generic_init(void)
{
r8a7740_clock_init(0);
r8a7740_add_standard_devices_dt();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}

static const char *r8a7740_boards_compat_dt[] __initdata = {
Expand Down

0 comments on commit 4333067

Please sign in to comment.