Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d73d8011 authored by Dan Williams's avatar Dan Williams Committed by Russell King
Browse files

[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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e702a715

arch/arm/mach-iop13xx/irq.c

+9 −45
Original line number Original line Diff line number Diff line
@@ -30,77 +30,65 @@ 




/* INTCTL0 CP6 R0 Page 4

/* INTCTL0 CP6 R0 Page 4

 */

 */

static inline u32 read_intctl_0(void)

static u32 read_intctl_0(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c0, c4, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c0, c4, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_intctl_0(u32 val)

static void write_intctl_0(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c0, c4, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c0, c4, 0"::"r" (val));

}

}





/* INTCTL1 CP6 R1 Page 4

/* INTCTL1 CP6 R1 Page 4

 */

 */

static inline u32 read_intctl_1(void)

static u32 read_intctl_1(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c1, c4, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c1, c4, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_intctl_1(u32 val)

static void write_intctl_1(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c1, c4, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c1, c4, 0"::"r" (val));

}

}





/* INTCTL2 CP6 R2 Page 4

/* INTCTL2 CP6 R2 Page 4

 */

 */

static inline u32 read_intctl_2(void)

static u32 read_intctl_2(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c2, c4, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c2, c4, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_intctl_2(u32 val)

static void write_intctl_2(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c2, c4, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c2, c4, 0"::"r" (val));

}

}





/* INTCTL3 CP6 R3 Page 4

/* INTCTL3 CP6 R3 Page 4

 */

 */

static inline u32 read_intctl_3(void)

static u32 read_intctl_3(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c3, c4, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c3, c4, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_intctl_3(u32 val)

static void write_intctl_3(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c3, c4, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c3, c4, 0"::"r" (val));

}

}





/* INTSTR0 CP6 R0 Page 5

/* INTSTR0 CP6 R0 Page 5

 */

 */

static inline u32 read_intstr_0(void)

static void write_intstr_0(u32 val)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c0, c5, 0":"=r" (val));

	return val;

}

static inline void write_intstr_0(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c0, c5, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c0, c5, 0"::"r" (val));

}

}





/* INTSTR1 CP6 R1 Page 5

/* INTSTR1 CP6 R1 Page 5

 */

 */

static inline u32 read_intstr_1(void)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c1, c5, 0":"=r" (val));

	return val;

}

static void write_intstr_1(u32 val)

static void write_intstr_1(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c1, c5, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c1, c5, 0"::"r" (val));
@@ -108,12 +96,6 @@ static void write_intstr_1(u32 val) 




/* INTSTR2 CP6 R2 Page 5

/* INTSTR2 CP6 R2 Page 5

 */

 */

static inline u32 read_intstr_2(void)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c2, c5, 0":"=r" (val));

	return val;

}

static void write_intstr_2(u32 val)

static void write_intstr_2(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c2, c5, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c2, c5, 0"::"r" (val));
@@ -121,12 +103,6 @@ static void write_intstr_2(u32 val) 




/* INTSTR3 CP6 R3 Page 5

/* INTSTR3 CP6 R3 Page 5

 */

 */

static inline u32 read_intstr_3(void)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c3, c5, 0":"=r" (val));

	return val;

}

static void write_intstr_3(u32 val)

static void write_intstr_3(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c3, c5, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c3, c5, 0"::"r" (val));
@@ -134,12 +110,6 @@ static void write_intstr_3(u32 val) 




/* INTBASE CP6 R0 Page 2

/* INTBASE CP6 R0 Page 2

 */

 */

static inline u32 read_intbase(void)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c0, c2, 0":"=r" (val));

	return val;

}

static void write_intbase(u32 val)

static void write_intbase(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c0, c2, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c0, c2, 0"::"r" (val));
@@ -147,12 +117,6 @@ static void write_intbase(u32 val) 




/* INTSIZE CP6 R2 Page 2

/* INTSIZE CP6 R2 Page 2

 */

 */

static inline u32 read_intsize(void)

{

	u32 val;

	asm volatile("mrc p6, 0, %0, c2, c2, 0":"=r" (val));

	return val;

}

static void write_intsize(u32 val)

static void write_intsize(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c2, c2, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c2, c2, 0"::"r" (val));

arch/arm/mach-iop13xx/msi.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -30,52 +30,52 @@ static DECLARE_BITMAP(msi_irq_in_use, IOP13XX_NUM_MSI_IRQS); 




/* IMIPR0 CP6 R8 Page 1

/* IMIPR0 CP6 R8 Page 1

 */

 */

static inline u32 read_imipr_0(void)

static u32 read_imipr_0(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c8, c1, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c8, c1, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_imipr_0(u32 val)

static void write_imipr_0(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c8, c1, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c8, c1, 0"::"r" (val));

}

}





/* IMIPR1 CP6 R9 Page 1

/* IMIPR1 CP6 R9 Page 1

 */

 */

static inline u32 read_imipr_1(void)

static u32 read_imipr_1(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c9, c1, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c9, c1, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_imipr_1(u32 val)

static void write_imipr_1(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c9, c1, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c9, c1, 0"::"r" (val));

}

}





/* IMIPR2 CP6 R10 Page 1

/* IMIPR2 CP6 R10 Page 1

 */

 */

static inline u32 read_imipr_2(void)

static u32 read_imipr_2(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c10, c1, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c10, c1, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_imipr_2(u32 val)

static void write_imipr_2(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c10, c1, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c10, c1, 0"::"r" (val));

}

}





/* IMIPR3 CP6 R11 Page 1

/* IMIPR3 CP6 R11 Page 1

 */

 */

static inline u32 read_imipr_3(void)

static u32 read_imipr_3(void)

{

{

	u32 val;

	u32 val;

	asm volatile("mrc p6, 0, %0, c11, c1, 0":"=r" (val));

	asm volatile("mrc p6, 0, %0, c11, c1, 0":"=r" (val));

	return val;

	return val;

}

}

static inline void write_imipr_3(u32 val)

static void write_imipr_3(u32 val)

{

{

	asm volatile("mcr p6, 0, %0, c11, c1, 0"::"r" (val));

	asm volatile("mcr p6, 0, %0, c11, c1, 0"::"r" (val));

}

}

arch/arm/mach-iop13xx/pci.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ void iop13xx_map_pci_memory(void) 
	}

	}

}

}





static inline int iop13xx_atu_function(int atu)

static int iop13xx_atu_function(int atu)

{

{

	int func = 0;

	int func = 0;

	/* the function number depends on the value of the

	/* the function number depends on the value of the
@@ -259,7 +259,7 @@ static int iop13xx_atux_pci_status(int clear) 
 * data.  Note that the data dependency on %0 encourages an abort

 * data.  Note that the data dependency on %0 encourages an abort

 * to be detected before we return.

 * to be detected before we return.

 */

 */

static inline u32 iop13xx_atux_read(unsigned long addr)

static u32 iop13xx_atux_read(unsigned long addr)

{

{

	u32 val;

	u32 val;
@@ -387,7 +387,7 @@ static int iop13xx_atue_pci_status(int clear) 
	return err;

	return err;

}

}





static inline int __init

static int

iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)

iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)

{

{

	WARN_ON(idsel != 0);

	WARN_ON(idsel != 0);
@@ -401,7 +401,7 @@ iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) 
	}

	}

}

}





static inline u32 iop13xx_atue_read(unsigned long addr)

static u32 iop13xx_atue_read(unsigned long addr)

{

{

	u32 val;

	u32 val;

arch/arm/mach-iop32x/glantank.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ void __init glantank_map_io(void) 
#define INTC	IRQ_IOP32X_XINT2

#define INTC	IRQ_IOP32X_XINT2

#define INTD	IRQ_IOP32X_XINT3

#define INTD	IRQ_IOP32X_XINT3





static inline int __init

static int __init

glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static int pci_irq_table[][4] = {

	static int pci_irq_table[][4] = {

arch/arm/mach-iop32x/iq31244.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ void __init iq31244_map_io(void) 
/*

/*

 * EP80219/IQ31244 PCI.

 * EP80219/IQ31244 PCI.

 */

 */

static inline int __init

static int __init

ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

{

{

	int irq;

	int irq;
@@ -140,7 +140,7 @@ static struct hw_pci ep80219_pci __initdata = { 
	.map_irq	= ep80219_pci_map_irq,

	.map_irq	= ep80219_pci_map_irq,

};

};





static inline int __init

static int __init

iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

{

{

	int irq;

	int irq;