From d624bd3cf7835612b25b9ec8db4002624c2dbb32 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 14 Mar 2012 10:29:26 +0100 Subject: MIPS: ath79: replace ath724x to ar724x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the 'ath724x' to 'ar724x' in function, variable and structure names to reflect the name of the real SoC. Signed-off-by: Gabor Juhos Acked-by: René Bolldorf Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3490/ Signed-off-by: Ralf Baechle --- arch/mips/ath79/mach-ubnt-xm.c | 4 ++-- arch/mips/ath79/pci.c | 6 +++--- arch/mips/ath79/pci.h | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'arch/mips/ath79') diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c index edbc093bf665..3266ee063bd6 100644 --- a/arch/mips/ath79/mach-ubnt-xm.c +++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -84,7 +84,7 @@ static struct ath79_spi_platform_data ubnt_xm_spi_data = { #ifdef CONFIG_PCI static struct ath9k_platform_data ubnt_xm_eeprom_data; -static struct ath724x_pci_data ubnt_xm_pci_data[] = { +static struct ar724x_pci_data ubnt_xm_pci_data[] = { { .irq = UBNT_XM_PCI_IRQ, .pdata = &ubnt_xm_eeprom_data, @@ -108,7 +108,7 @@ static void __init ubnt_xm_init(void) memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR, sizeof(ubnt_xm_eeprom_data.eeprom_data)); - ath724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); + ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); #endif /* CONFIG_PCI */ ath79_register_pci(); diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c index 855a69dcc86e..72281fb5360f 100644 --- a/arch/mips/ath79/pci.c +++ b/arch/mips/ath79/pci.c @@ -13,10 +13,10 @@ #include #include "pci.h" -static struct ath724x_pci_data *pci_data; +static struct ar724x_pci_data *pci_data; static int pci_data_size; -void ath724x_pci_add_data(struct ath724x_pci_data *data, int size) +void ar724x_pci_add_data(struct ar724x_pci_data *data, int size) { pci_data = data; pci_data_size = size; @@ -50,7 +50,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev) int __init ath79_register_pci(void) { if (soc_is_ar724x()) - return ath724x_pcibios_init(); + return ar724x_pcibios_init(); return -ENODEV; } diff --git a/arch/mips/ath79/pci.h b/arch/mips/ath79/pci.h index 787fac2c08f0..e0601c4a7fc6 100644 --- a/arch/mips/ath79/pci.h +++ b/arch/mips/ath79/pci.h @@ -8,15 +8,15 @@ * by the Free Software Foundation. */ -#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H -#define __ASM_MACH_ATH79_PCI_ATH724X_H +#ifndef _ATH79_PCI_H +#define _ATH79_PCI_H -struct ath724x_pci_data { +struct ar724x_pci_data { int irq; void *pdata; }; -void ath724x_pci_add_data(struct ath724x_pci_data *data, int size); +void ar724x_pci_add_data(struct ar724x_pci_data *data, int size); #ifdef CONFIG_PCI int ath79_register_pci(void); @@ -24,4 +24,4 @@ int ath79_register_pci(void); static inline int ath79_register_pci(void) { return 0; } #endif -#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */ +#endif /* _ATH79_PCI_H */ -- cgit v1.2.1