diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-05-08 09:29:01 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-14 04:14:40 -0400 |
commit | 3210c05327e2b44b3bf96bab550d72cdb18b64e4 (patch) | |
tree | c77b9ddde6ef58e3d4a14c1a005542ea7c590c84 /arch/arm/mach-ux500/board-mop500.c | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
ARM: ux500: Remove duplicated assignment of ab8500_platdata
Since: "05ec260 mfd: db8500-prcmu: update resource passing", the AB8500's
platform data 'ab8500_platdata' is passed directly as an attribute to
'db8500_prcmu_pdata', so there's no requirement to assign it a second
time. In fact, it's only due to an ordering issue that the entire
'db8500_prcmu_pdata' data structure isn't completely over-written by the
assignment in u8500_init_devices().
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 3cd555ac6d0a..78389de94dde 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -623,7 +623,7 @@ static void __init mop500_init_machine(void) | |||
623 | sdi0_reg_info.gpios[0].gpio = GPIO_SDMMC_1V8_3V_SEL; | 623 | sdi0_reg_info.gpios[0].gpio = GPIO_SDMMC_1V8_3V_SEL; |
624 | 624 | ||
625 | mop500_pinmaps_init(); | 625 | mop500_pinmaps_init(); |
626 | parent = u8500_init_devices(&ab8500_platdata); | 626 | parent = u8500_init_devices(); |
627 | 627 | ||
628 | for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) | 628 | for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) |
629 | mop500_platform_devs[i]->dev.parent = parent; | 629 | mop500_platform_devs[i]->dev.parent = parent; |
@@ -660,7 +660,7 @@ static void __init snowball_init_machine(void) | |||
660 | sdi0_reg_info.gpios[0].gpio = SNOWBALL_SDMMC_1V8_3V_GPIO; | 660 | sdi0_reg_info.gpios[0].gpio = SNOWBALL_SDMMC_1V8_3V_GPIO; |
661 | 661 | ||
662 | snowball_pinmaps_init(); | 662 | snowball_pinmaps_init(); |
663 | parent = u8500_init_devices(&ab8500_platdata); | 663 | parent = u8500_init_devices(); |
664 | 664 | ||
665 | for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++) | 665 | for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++) |
666 | snowball_platform_devs[i]->dev.parent = parent; | 666 | snowball_platform_devs[i]->dev.parent = parent; |
@@ -698,7 +698,7 @@ static void __init hrefv60_init_machine(void) | |||
698 | sdi0_reg_info.gpios[0].gpio = HREFV60_SDMMC_1V8_3V_GPIO; | 698 | sdi0_reg_info.gpios[0].gpio = HREFV60_SDMMC_1V8_3V_GPIO; |
699 | 699 | ||
700 | hrefv60_pinmaps_init(); | 700 | hrefv60_pinmaps_init(); |
701 | parent = u8500_init_devices(&ab8500_platdata); | 701 | parent = u8500_init_devices(); |
702 | 702 | ||
703 | for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) | 703 | for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) |
704 | mop500_platform_devs[i]->dev.parent = parent; | 704 | mop500_platform_devs[i]->dev.parent = parent; |