From d73d8011779292788def2cd2520d6f39d9b406de Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 15 May 2007 01:03:36 +0100 Subject: [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files WARNING: arch/arm/mach-iop13xx/built-in.o - Section mismatch: reference to .init.text:iop13xx_pcie_map_irq from .text between 'iop13xx_pci_setup' (at offset 0x7fc) and 'iop13xx_map_pci_memory' While fixing this warning I also recalled Adrian Bunk's recommendation to not use inline in .c files, as 'iop13xx_map_pci_memory' is needlessly inlined. Removing 'inline' uncovered some dead code so that is cleaned up as well. Signed-off-by: Dan Williams Signed-off-by: Russell King --- arch/arm/plat-iop/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/plat-iop/pci.c') diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index e2744b7227c..d3605934f1c 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c @@ -88,7 +88,7 @@ static int iop3xx_pci_status(void) * data. Note that the 4 nop's ensure that we are able to handle * a delayed abort (in theory.) */ -static inline u32 iop3xx_read(unsigned long addr) +static u32 iop3xx_read(unsigned long addr) { u32 val; @@ -321,7 +321,7 @@ void __init iop3xx_atu_disable(void) /* Flag to determine whether the ATU is initialized and the PCI bus scanned */ int init_atu; -void iop3xx_pci_preinit(void) +void __init iop3xx_pci_preinit(void) { if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) { iop3xx_atu_disable(); -- cgit v1.2.3 From 6cbdc8c5357276307a77deeada3f04626ff17da6 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Fri, 11 May 2007 20:40:30 +0100 Subject: [ARM] spelling fixes Spelling fixes in arch/arm/. Signed-off-by: Simon Arlott Signed-off-by: Russell King --- arch/arm/plat-iop/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/plat-iop/pci.c') diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index d3605934f1c..c200c281006 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c @@ -85,7 +85,7 @@ static int iop3xx_pci_status(void) /* * Simply write the address register and read the configuration - * data. Note that the 4 nop's ensure that we are able to handle + * data. Note that the 4 nops ensure that we are able to handle * a delayed abort (in theory.) */ static u32 iop3xx_read(unsigned long addr) -- cgit v1.2.3