Commit 0744a3ee37784dfda0025963716a36c3f1e3adcc
1 parent
87e040b645
Exists in
master
and in
6 other branches
ARM: platform fixups: remove mdesc argument to fixup function
Get rid of the mdesc pointer in the fixup function call. No one uses the mdesc pointer, it shouldn't be modified anyway, and we can't wrap it, so let's remove it. Platform files found by: $ regexp=$(git grep -h '\.fixup.*=' arch/arm | sed 's!.*= *\([^,]*\),* *!\1!' | sort -u | tr '\n' '|' | sed 's,|$,,;s,|,\\|,g') $ git grep $regexp arch/arm Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Showing 32 changed files with 50 additions and 66 deletions Side-by-side Diff
- arch/arm/include/asm/mach/arch.h
- arch/arm/kernel/setup.c
- arch/arm/mach-bcmring/arch.c
- arch/arm/mach-clps711x/clep7312.c
- arch/arm/mach-clps711x/edb7211-arch.c
- arch/arm/mach-clps711x/fortunet.c
- arch/arm/mach-clps711x/p720t.c
- arch/arm/mach-footbridge/cats-hw.c
- arch/arm/mach-footbridge/netwinder-hw.c
- arch/arm/mach-msm/board-halibut.c
- arch/arm/mach-msm/board-mahimahi.c
- arch/arm/mach-msm/board-sapphire.c
- arch/arm/mach-msm/board-trout.c
- arch/arm/mach-orion5x/common.c
- arch/arm/mach-orion5x/common.h
- arch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/eseries.c
- arch/arm/mach-pxa/eseries.h
- arch/arm/mach-pxa/poodle.c
- arch/arm/mach-pxa/spitz.c
- arch/arm/mach-pxa/tosa.c
- arch/arm/mach-realview/core.c
- arch/arm/mach-realview/core.h
- arch/arm/mach-realview/realview_pb1176.c
- arch/arm/mach-realview/realview_pbx.c
- arch/arm/mach-s3c2412/mach-smdk2413.c
- arch/arm/mach-s3c2412/mach-vstms.c
- arch/arm/mach-sa1100/assabet.c
- arch/arm/mach-tegra/board-harmony.c
- arch/arm/mach-tegra/board-paz00.c
- arch/arm/mach-tegra/board-trimslice.c
arch/arm/include/asm/mach/arch.h
| ... | ... | @@ -34,8 +34,7 @@ |
| 34 | 34 | unsigned int reserve_lp1 :1; /* never has lp1 */ |
| 35 | 35 | unsigned int reserve_lp2 :1; /* never has lp2 */ |
| 36 | 36 | unsigned int soft_reboot :1; /* soft reboot */ |
| 37 | - void (*fixup)(struct machine_desc *, | |
| 38 | - struct tag *, char **, | |
| 37 | + void (*fixup)(struct tag *, char **, | |
| 39 | 38 | struct meminfo *); |
| 40 | 39 | void (*reserve)(void);/* reserve mem blocks */ |
| 41 | 40 | void (*map_io)(void);/* IO mapping function */ |
arch/arm/kernel/setup.c
arch/arm/mach-bcmring/arch.c
| ... | ... | @@ -136,8 +136,8 @@ |
| 136 | 136 | * |
| 137 | 137 | *****************************************************************************/ |
| 138 | 138 | |
| 139 | -static void __init bcmring_fixup(struct machine_desc *desc, | |
| 140 | - struct tag *t, char **cmdline, struct meminfo *mi) { | |
| 139 | +static void __init bcmring_fixup(struct tag *t, char **cmdline, | |
| 140 | + struct meminfo *mi) { | |
| 141 | 141 | #ifdef CONFIG_BLK_DEV_INITRD |
| 142 | 142 | printk(KERN_NOTICE "bcmring_fixup\n"); |
| 143 | 143 | t->hdr.tag = ATAG_CORE; |
arch/arm/mach-clps711x/clep7312.c
| ... | ... | @@ -26,8 +26,7 @@ |
| 26 | 26 | #include "common.h" |
| 27 | 27 | |
| 28 | 28 | static void __init |
| 29 | -fixup_clep7312(struct machine_desc *desc, struct tag *tags, | |
| 30 | - char **cmdline, struct meminfo *mi) | |
| 29 | +fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 31 | 30 | { |
| 32 | 31 | mi->nr_banks=1; |
| 33 | 32 | mi->bank[0].start = 0xc0000000; |
arch/arm/mach-clps711x/edb7211-arch.c
| ... | ... | @@ -37,8 +37,7 @@ |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | static void __init |
| 40 | -fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |
| 41 | - char **cmdline, struct meminfo *mi) | |
| 40 | +fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 42 | 41 | { |
| 43 | 42 | /* |
| 44 | 43 | * Bank start addresses are not present in the information |
arch/arm/mach-clps711x/fortunet.c
| ... | ... | @@ -57,8 +57,7 @@ |
| 57 | 57 | #define IMAGE_PARAMS_PHYS 0xC01F0000 |
| 58 | 58 | |
| 59 | 59 | static void __init |
| 60 | -fortunet_fixup(struct machine_desc *desc, struct tag *tags, | |
| 61 | - char **cmdline, struct meminfo *mi) | |
| 60 | +fortunet_fixup(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 62 | 61 | { |
| 63 | 62 | IMAGE_PARAMS *ip = phys_to_virt(IMAGE_PARAMS_PHYS); |
| 64 | 63 | *cmdline = phys_to_virt(ip->command_line); |
arch/arm/mach-clps711x/p720t.c
| ... | ... | @@ -56,8 +56,7 @@ |
| 56 | 56 | }; |
| 57 | 57 | |
| 58 | 58 | static void __init |
| 59 | -fixup_p720t(struct machine_desc *desc, struct tag *tag, | |
| 60 | - char **cmdline, struct meminfo *mi) | |
| 59 | +fixup_p720t(struct tag *tag, char **cmdline, struct meminfo *mi) | |
| 61 | 60 | { |
| 62 | 61 | /* |
| 63 | 62 | * Our bootloader doesn't setup any tags (yet). |
arch/arm/mach-footbridge/cats-hw.c
| ... | ... | @@ -76,8 +76,7 @@ |
| 76 | 76 | * hard reboots fail on early boards. |
| 77 | 77 | */ |
| 78 | 78 | static void __init |
| 79 | -fixup_cats(struct machine_desc *desc, struct tag *tags, | |
| 80 | - char **cmdline, struct meminfo *mi) | |
| 79 | +fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 81 | 80 | { |
| 82 | 81 | screen_info.orig_video_lines = 25; |
| 83 | 82 | screen_info.orig_video_points = 16; |
arch/arm/mach-footbridge/netwinder-hw.c
| ... | ... | @@ -631,8 +631,7 @@ |
| 631 | 631 | * the parameter page. |
| 632 | 632 | */ |
| 633 | 633 | static void __init |
| 634 | -fixup_netwinder(struct machine_desc *desc, struct tag *tags, | |
| 635 | - char **cmdline, struct meminfo *mi) | |
| 634 | +fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 636 | 635 | { |
| 637 | 636 | #ifdef CONFIG_ISAPNP |
| 638 | 637 | extern int isapnp_disable; |
arch/arm/mach-msm/board-halibut.c
| ... | ... | @@ -78,8 +78,8 @@ |
| 78 | 78 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | -static void __init halibut_fixup(struct machine_desc *desc, struct tag *tags, | |
| 82 | - char **cmdline, struct meminfo *mi) | |
| 81 | +static void __init halibut_fixup(struct tag *tags, char **cmdline, | |
| 82 | + struct meminfo *mi) | |
| 83 | 83 | { |
| 84 | 84 | mi->nr_banks=1; |
| 85 | 85 | mi->bank[0].start = PHYS_OFFSET; |
arch/arm/mach-msm/board-mahimahi.c
| ... | ... | @@ -53,8 +53,8 @@ |
| 53 | 53 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -static void __init mahimahi_fixup(struct machine_desc *desc, struct tag *tags, | |
| 57 | - char **cmdline, struct meminfo *mi) | |
| 56 | +static void __init mahimahi_fixup(struct tag *tags, char **cmdline, | |
| 57 | + struct meminfo *mi) | |
| 58 | 58 | { |
| 59 | 59 | mi->nr_banks = 2; |
| 60 | 60 | mi->bank[0].start = PHYS_OFFSET; |
arch/arm/mach-msm/board-sapphire.c
| ... | ... | @@ -77,8 +77,8 @@ |
| 77 | 77 | } |
| 78 | 78 | }; |
| 79 | 79 | |
| 80 | -static void __init sapphire_fixup(struct machine_desc *desc, struct tag *tags, | |
| 81 | - char **cmdline, struct meminfo *mi) | |
| 80 | +static void __init sapphire_fixup(struct tag *tags, char **cmdline, | |
| 81 | + struct meminfo *mi) | |
| 82 | 82 | { |
| 83 | 83 | int smi_sz = parse_tag_smi((const struct tag *)tags); |
| 84 | 84 |
arch/arm/mach-msm/board-trout.c
| ... | ... | @@ -48,8 +48,8 @@ |
| 48 | 48 | msm_init_irq(); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -static void __init trout_fixup(struct machine_desc *desc, struct tag *tags, | |
| 52 | - char **cmdline, struct meminfo *mi) | |
| 51 | +static void __init trout_fixup(struct tag *tags, char **cmdline, | |
| 52 | + struct meminfo *mi) | |
| 53 | 53 | { |
| 54 | 54 | mi->nr_banks = 1; |
| 55 | 55 | mi->bank[0].start = PHYS_OFFSET; |
arch/arm/mach-orion5x/common.c
| ... | ... | @@ -308,8 +308,8 @@ |
| 308 | 308 | * Many orion-based systems have buggy bootloader implementations. |
| 309 | 309 | * This is a common fixup for bogus memory tags. |
| 310 | 310 | */ |
| 311 | -void __init tag_fixup_mem32(struct machine_desc *mdesc, struct tag *t, | |
| 312 | - char **from, struct meminfo *meminfo) | |
| 311 | +void __init tag_fixup_mem32(struct tag *t, char **from, | |
| 312 | + struct meminfo *meminfo) | |
| 313 | 313 | { |
| 314 | 314 | for (; t->hdr.size; t = tag_next(t)) |
| 315 | 315 | if (t->hdr.tag == ATAG_MEM && |
arch/arm/mach-orion5x/common.h
| ... | ... | @@ -53,11 +53,9 @@ |
| 53 | 53 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
| 54 | 54 | int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin); |
| 55 | 55 | |
| 56 | -struct machine_desc; | |
| 57 | 56 | struct meminfo; |
| 58 | 57 | struct tag; |
| 59 | -extern void __init tag_fixup_mem32(struct machine_desc *, struct tag *, | |
| 60 | - char **, struct meminfo *); | |
| 58 | +extern void __init tag_fixup_mem32(struct tag *, char **, struct meminfo *); | |
| 61 | 59 | |
| 62 | 60 | |
| 63 | 61 | #endif |
arch/arm/mach-pxa/cm-x300.c
| ... | ... | @@ -839,8 +839,8 @@ |
| 839 | 839 | cm_x300_init_bl(); |
| 840 | 840 | } |
| 841 | 841 | |
| 842 | -static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags, | |
| 843 | - char **cmdline, struct meminfo *mi) | |
| 842 | +static void __init cm_x300_fixup(struct tag *tags, char **cmdline, | |
| 843 | + struct meminfo *mi) | |
| 844 | 844 | { |
| 845 | 845 | /* Make sure that mi->bank[0].start = PHYS_ADDR */ |
| 846 | 846 | for (; tags->hdr.size; tags = tag_next(tags)) |
arch/arm/mach-pxa/corgi.c
| ... | ... | @@ -705,8 +705,8 @@ |
| 705 | 705 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 706 | 706 | } |
| 707 | 707 | |
| 708 | -static void __init fixup_corgi(struct machine_desc *desc, | |
| 709 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 708 | +static void __init fixup_corgi(struct tag *tags, char **cmdline, | |
| 709 | + struct meminfo *mi) | |
| 710 | 710 | { |
| 711 | 711 | sharpsl_save_param(); |
| 712 | 712 | mi->nr_banks=1; |
arch/arm/mach-pxa/eseries.c
| ... | ... | @@ -41,8 +41,7 @@ |
| 41 | 41 | #include "clock.h" |
| 42 | 42 | |
| 43 | 43 | /* Only e800 has 128MB RAM */ |
| 44 | -void __init eseries_fixup(struct machine_desc *desc, | |
| 45 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 44 | +void __init eseries_fixup(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 46 | 45 | { |
| 47 | 46 | mi->nr_banks=1; |
| 48 | 47 | mi->bank[0].start = 0xa0000000; |
arch/arm/mach-pxa/eseries.h
| 1 | -void __init eseries_fixup(struct machine_desc *desc, | |
| 2 | - struct tag *tags, char **cmdline, struct meminfo *mi); | |
| 1 | +void __init eseries_fixup(struct tag *tags, char **cmdline, struct meminfo *mi); | |
| 3 | 2 | |
| 4 | 3 | extern struct pxa2xx_udc_mach_info e7xx_udc_mach_info; |
| 5 | 4 | extern struct pxaficp_platform_data e7xx_ficp_platform_data; |
arch/arm/mach-pxa/poodle.c
| ... | ... | @@ -454,8 +454,8 @@ |
| 454 | 454 | poodle_init_spi(); |
| 455 | 455 | } |
| 456 | 456 | |
| 457 | -static void __init fixup_poodle(struct machine_desc *desc, | |
| 458 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 457 | +static void __init fixup_poodle(struct tag *tags, char **cmdline, | |
| 458 | + struct meminfo *mi) | |
| 459 | 459 | { |
| 460 | 460 | sharpsl_save_param(); |
| 461 | 461 | mi->nr_banks=1; |
arch/arm/mach-pxa/spitz.c
| ... | ... | @@ -970,8 +970,8 @@ |
| 970 | 970 | spitz_i2c_init(); |
| 971 | 971 | } |
| 972 | 972 | |
| 973 | -static void __init spitz_fixup(struct machine_desc *desc, | |
| 974 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 973 | +static void __init spitz_fixup(struct tag *tags, char **cmdline, | |
| 974 | + struct meminfo *mi) | |
| 975 | 975 | { |
| 976 | 976 | sharpsl_save_param(); |
| 977 | 977 | mi->nr_banks = 1; |
arch/arm/mach-pxa/tosa.c
| ... | ... | @@ -960,8 +960,8 @@ |
| 960 | 960 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 961 | 961 | } |
| 962 | 962 | |
| 963 | -static void __init fixup_tosa(struct machine_desc *desc, | |
| 964 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 963 | +static void __init fixup_tosa(struct tag *tags, char **cmdline, | |
| 964 | + struct meminfo *mi) | |
| 965 | 965 | { |
| 966 | 966 | sharpsl_save_param(); |
| 967 | 967 | mi->nr_banks=1; |
arch/arm/mach-realview/core.c
| ... | ... | @@ -517,8 +517,7 @@ |
| 517 | 517 | /* |
| 518 | 518 | * Setup the memory banks. |
| 519 | 519 | */ |
| 520 | -void realview_fixup(struct machine_desc *mdesc, struct tag *tags, char **from, | |
| 521 | - struct meminfo *meminfo) | |
| 520 | +void realview_fixup(struct tag *tags, char **from, struct meminfo *meminfo) | |
| 522 | 521 | { |
| 523 | 522 | /* |
| 524 | 523 | * Most RealView platforms have 512MB contiguous RAM at 0x70000000. |
arch/arm/mach-realview/core.h
| ... | ... | @@ -63,8 +63,8 @@ |
| 63 | 63 | extern int realview_eth_register(const char *name, struct resource *res); |
| 64 | 64 | extern int realview_usb_register(struct resource *res); |
| 65 | 65 | extern void realview_init_early(void); |
| 66 | -extern void realview_fixup(struct machine_desc *mdesc, struct tag *tags, | |
| 67 | - char **from, struct meminfo *meminfo); | |
| 66 | +extern void realview_fixup(struct tag *tags, char **from, | |
| 67 | + struct meminfo *meminfo); | |
| 68 | 68 | extern void (*realview_reset)(char); |
| 69 | 69 | |
| 70 | 70 | #endif |
arch/arm/mach-realview/realview_pb1176.c
| ... | ... | @@ -316,8 +316,7 @@ |
| 316 | 316 | __raw_writel(REALVIEW_PB1176_SYS_SOFT_RESET, reset_ctrl); |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | -static void realview_pb1176_fixup(struct machine_desc *mdesc, | |
| 320 | - struct tag *tags, char **from, | |
| 319 | +static void realview_pb1176_fixup(struct tag *tags, char **from, | |
| 321 | 320 | struct meminfo *meminfo) |
| 322 | 321 | { |
| 323 | 322 | /* |
arch/arm/mach-realview/realview_pbx.c
| ... | ... | @@ -319,8 +319,8 @@ |
| 319 | 319 | .init = realview_pbx_timer_init, |
| 320 | 320 | }; |
| 321 | 321 | |
| 322 | -static void realview_pbx_fixup(struct machine_desc *mdesc, struct tag *tags, | |
| 323 | - char **from, struct meminfo *meminfo) | |
| 322 | +static void realview_pbx_fixup(struct tag *tags, char **from, | |
| 323 | + struct meminfo *meminfo) | |
| 324 | 324 | { |
| 325 | 325 | #ifdef CONFIG_SPARSEMEM |
| 326 | 326 | /* |
| ... | ... | @@ -335,7 +335,7 @@ |
| 335 | 335 | meminfo->bank[2].size = SZ_256M; |
| 336 | 336 | meminfo->nr_banks = 3; |
| 337 | 337 | #else |
| 338 | - realview_fixup(mdesc, tags, from, meminfo); | |
| 338 | + realview_fixup(tags, from, meminfo); | |
| 339 | 339 | #endif |
| 340 | 340 | } |
| 341 | 341 |
arch/arm/mach-s3c2412/mach-smdk2413.c
| ... | ... | @@ -92,8 +92,7 @@ |
| 92 | 92 | &s3c_device_usbgadget, |
| 93 | 93 | }; |
| 94 | 94 | |
| 95 | -static void __init smdk2413_fixup(struct machine_desc *desc, | |
| 96 | - struct tag *tags, char **cmdline, | |
| 95 | +static void __init smdk2413_fixup(struct tag *tags, char **cmdline, | |
| 97 | 96 | struct meminfo *mi) |
| 98 | 97 | { |
| 99 | 98 | if (tags != phys_to_virt(S3C2410_SDRAM_PA + 0x100)) { |
arch/arm/mach-s3c2412/mach-vstms.c
| ... | ... | @@ -129,9 +129,8 @@ |
| 129 | 129 | &s3c_device_nand, |
| 130 | 130 | }; |
| 131 | 131 | |
| 132 | -static void __init vstms_fixup(struct machine_desc *desc, | |
| 133 | - struct tag *tags, char **cmdline, | |
| 134 | - struct meminfo *mi) | |
| 132 | +static void __init vstms_fixup(struct tag *tags, char **cmdline, | |
| 133 | + struct meminfo *mi) | |
| 135 | 134 | { |
| 136 | 135 | if (tags != phys_to_virt(S3C2410_SDRAM_PA + 0x100)) { |
| 137 | 136 | mi->nr_banks=1; |
arch/arm/mach-sa1100/assabet.c
| ... | ... | @@ -301,8 +301,7 @@ |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | static void __init |
| 304 | -fixup_assabet(struct machine_desc *desc, struct tag *tags, | |
| 305 | - char **cmdline, struct meminfo *mi) | |
| 304 | +fixup_assabet(struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 306 | 305 | { |
| 307 | 306 | /* This must be done before any call to machine_has_neponset() */ |
| 308 | 307 | map_sa1100_gpio_regs(); |
arch/arm/mach-tegra/board-harmony.c
| ... | ... | @@ -123,8 +123,8 @@ |
| 123 | 123 | &harmony_audio_device, |
| 124 | 124 | }; |
| 125 | 125 | |
| 126 | -static void __init tegra_harmony_fixup(struct machine_desc *desc, | |
| 127 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 126 | +static void __init tegra_harmony_fixup(struct tag *tags, char **cmdline, | |
| 127 | + struct meminfo *mi) | |
| 128 | 128 | { |
| 129 | 129 | mi->nr_banks = 2; |
| 130 | 130 | mi->bank[0].start = PHYS_OFFSET; |
arch/arm/mach-tegra/board-paz00.c
| ... | ... | @@ -84,8 +84,8 @@ |
| 84 | 84 | platform_device_register(&tegra_ehci3_device); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | -static void __init tegra_paz00_fixup(struct machine_desc *desc, | |
| 88 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 87 | +static void __init tegra_paz00_fixup(struct tag *tags, char **cmdline, | |
| 88 | + struct meminfo *mi) | |
| 89 | 89 | { |
| 90 | 90 | mi->nr_banks = 1; |
| 91 | 91 | mi->bank[0].start = PHYS_OFFSET; |
arch/arm/mach-tegra/board-trimslice.c
| ... | ... | @@ -126,8 +126,8 @@ |
| 126 | 126 | platform_device_register(&tegra_ehci1_device); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | -static void __init tegra_trimslice_fixup(struct machine_desc *desc, | |
| 130 | - struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 129 | +static void __init tegra_trimslice_fixup(struct tag *tags, char **cmdline, | |
| 130 | + struct meminfo *mi) | |
| 131 | 131 | { |
| 132 | 132 | mi->nr_banks = 2; |
| 133 | 133 | mi->bank[0].start = PHYS_OFFSET; |