diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-10 06:27:28 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-04-26 06:05:38 -0400 |
commit | 8084de8ad53332ed6e0ffe5db85533b8150d7d6b (patch) | |
tree | 962de4be7e4540a1e4c3f0a2673e6d29379150e3 | |
parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) |
ARM: PCI: remove unused sys->hw
Some platforms mark their hw_pci structure as __initdata, which means
it will be discarded after init time. Storing pointers to __initdata
in long lived data structures is a potential source of problems, and
in this case, sys->hw is unused apart from its initialization.
So, lets remove this member and its initializer.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/include/asm/mach/pci.h | 1 | ||||
-rw-r--r-- | arch/arm/kernel/bios32.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index d943b7d20f11..0fc85480d34b 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h | |||
@@ -45,7 +45,6 @@ struct pci_sys_data { | |||
45 | u8 (*swizzle)(struct pci_dev *, u8 *); | 45 | u8 (*swizzle)(struct pci_dev *, u8 *); |
46 | /* IRQ mapping */ | 46 | /* IRQ mapping */ |
47 | int (*map_irq)(const struct pci_dev *, u8, u8); | 47 | int (*map_irq)(const struct pci_dev *, u8, u8); |
48 | struct hw_pci *hw; | ||
49 | void *private_data; /* platform controller private data */ | 48 | void *private_data; /* platform controller private data */ |
50 | }; | 49 | }; |
51 | 50 | ||
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index ede5f7741c42..e17dd2591b26 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
@@ -424,7 +424,6 @@ static void __init pcibios_init_hw(struct hw_pci *hw) | |||
424 | #ifdef CONFIG_PCI_DOMAINS | 424 | #ifdef CONFIG_PCI_DOMAINS |
425 | sys->domain = hw->domain; | 425 | sys->domain = hw->domain; |
426 | #endif | 426 | #endif |
427 | sys->hw = hw; | ||
428 | sys->busnr = busnr; | 427 | sys->busnr = busnr; |
429 | sys->swizzle = hw->swizzle; | 428 | sys->swizzle = hw->swizzle; |
430 | sys->map_irq = hw->map_irq; | 429 | sys->map_irq = hw->map_irq; |