diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-14 10:36:08 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-05-15 17:49:04 +0200 |
| commit | 881b6ef0cca3395ac0171472a1ce768fede7535b (patch) | |
| tree | a59dabc68964b8e2a5edd147b7999f1c8fe64ea9 /arch/mips/ath79 | |
| parent | 4c07c7dfa0f3575dc3276c544349fbf181381167 (diff) | |
| download | linux-3.10-881b6ef0cca3395ac0171472a1ce768fede7535b.tar.gz linux-3.10-881b6ef0cca3395ac0171472a1ce768fede7535b.tar.bz2 linux-3.10-881b6ef0cca3395ac0171472a1ce768fede7535b.zip | |
MIPS: ath79: get rid of some ifdefs in mach-ubnt-xm.c
Remove a superfluous ifdef around an include. Also
reorganize the board setup code a bit, so another
ifdef can be removed.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3497/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ath79')
| -rw-r--r-- | arch/mips/ath79/mach-ubnt-xm.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c index 0d95b67a7d4..1e6b986cb47 100644 --- a/arch/mips/ath79/mach-ubnt-xm.c +++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -12,10 +12,7 @@ #include <linux/init.h> #include <linux/pci.h> - -#ifdef CONFIG_PCI #include <linux/ath9k_platform.h> -#endif /* CONFIG_PCI */ #include <asm/mach-ath79/irq.h> @@ -91,6 +88,17 @@ static struct ar724x_pci_data ubnt_xm_pci_data[] = { .pdata = &ubnt_xm_eeprom_data, }, }; + +static void __init ubnt_xm_pci_init(void) +{ + memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR, + sizeof(ubnt_xm_eeprom_data.eeprom_data)); + + ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); + ath79_register_pci(); +} +#else +static inline void ubnt_xm_pci_init(void) {} #endif /* CONFIG_PCI */ static void __init ubnt_xm_init(void) @@ -105,14 +113,7 @@ static void __init ubnt_xm_init(void) ath79_register_spi(&ubnt_xm_spi_data, ubnt_xm_spi_info, ARRAY_SIZE(ubnt_xm_spi_info)); -#ifdef CONFIG_PCI - memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR, - sizeof(ubnt_xm_eeprom_data.eeprom_data)); - - ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); -#endif /* CONFIG_PCI */ - - ath79_register_pci(); + ubnt_xm_pci_init(); } MIPS_MACHINE(ATH79_MACH_UBNT_XM, |