aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/pci.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2007-05-14 20:03:36 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-16 10:35:27 -0400
commitd73d8011779292788def2cd2520d6f39d9b406de (patch)
tree4a74fca4a1e549091414a0a0cbbc2cf63fcbd64e /arch/arm/mach-iop13xx/pci.c
parente702a7155d14a6e11645e17d829217ae98fd45bb (diff)
[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 <dan.j.williams@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop13xx/pci.c')
-rw-r--r--arch/arm/mach-iop13xx/pci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 1c9e94c38b7e..69e8953832fd 100644
--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -144,7 +144,7 @@ void iop13xx_map_pci_memory(void)
144 } 144 }
145} 145}
146 146
147static inline int iop13xx_atu_function(int atu) 147static int iop13xx_atu_function(int atu)
148{ 148{
149 int func = 0; 149 int func = 0;
150 /* the function number depends on the value of the 150 /* the function number depends on the value of the
@@ -259,7 +259,7 @@ static int iop13xx_atux_pci_status(int clear)
259 * data. Note that the data dependency on %0 encourages an abort 259 * data. Note that the data dependency on %0 encourages an abort
260 * to be detected before we return. 260 * to be detected before we return.
261 */ 261 */
262static inline u32 iop13xx_atux_read(unsigned long addr) 262static u32 iop13xx_atux_read(unsigned long addr)
263{ 263{
264 u32 val; 264 u32 val;
265 265
@@ -387,7 +387,7 @@ static int iop13xx_atue_pci_status(int clear)
387 return err; 387 return err;
388} 388}
389 389
390static inline int __init 390static int
391iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) 391iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
392{ 392{
393 WARN_ON(idsel != 0); 393 WARN_ON(idsel != 0);
@@ -401,7 +401,7 @@ iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
401 } 401 }
402} 402}
403 403
404static inline u32 iop13xx_atue_read(unsigned long addr) 404static u32 iop13xx_atue_read(unsigned long addr)
405{ 405{
406 u32 val; 406 u32 val;
407 407