diff options
Diffstat (limited to 'arch/arm/mach-iop13xx/msi.c')
-rw-r--r-- | arch/arm/mach-iop13xx/msi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c index 2d2369302220..63ef1124ca5c 100644 --- a/arch/arm/mach-iop13xx/msi.c +++ b/arch/arm/mach-iop13xx/msi.c | |||
@@ -30,52 +30,52 @@ static DECLARE_BITMAP(msi_irq_in_use, IOP13XX_NUM_MSI_IRQS); | |||
30 | 30 | ||
31 | /* IMIPR0 CP6 R8 Page 1 | 31 | /* IMIPR0 CP6 R8 Page 1 |
32 | */ | 32 | */ |
33 | static inline u32 read_imipr_0(void) | 33 | static u32 read_imipr_0(void) |
34 | { | 34 | { |
35 | u32 val; | 35 | u32 val; |
36 | asm volatile("mrc p6, 0, %0, c8, c1, 0":"=r" (val)); | 36 | asm volatile("mrc p6, 0, %0, c8, c1, 0":"=r" (val)); |
37 | return val; | 37 | return val; |
38 | } | 38 | } |
39 | static inline void write_imipr_0(u32 val) | 39 | static void write_imipr_0(u32 val) |
40 | { | 40 | { |
41 | asm volatile("mcr p6, 0, %0, c8, c1, 0"::"r" (val)); | 41 | asm volatile("mcr p6, 0, %0, c8, c1, 0"::"r" (val)); |
42 | } | 42 | } |
43 | 43 | ||
44 | /* IMIPR1 CP6 R9 Page 1 | 44 | /* IMIPR1 CP6 R9 Page 1 |
45 | */ | 45 | */ |
46 | static inline u32 read_imipr_1(void) | 46 | static u32 read_imipr_1(void) |
47 | { | 47 | { |
48 | u32 val; | 48 | u32 val; |
49 | asm volatile("mrc p6, 0, %0, c9, c1, 0":"=r" (val)); | 49 | asm volatile("mrc p6, 0, %0, c9, c1, 0":"=r" (val)); |
50 | return val; | 50 | return val; |
51 | } | 51 | } |
52 | static inline void write_imipr_1(u32 val) | 52 | static void write_imipr_1(u32 val) |
53 | { | 53 | { |
54 | asm volatile("mcr p6, 0, %0, c9, c1, 0"::"r" (val)); | 54 | asm volatile("mcr p6, 0, %0, c9, c1, 0"::"r" (val)); |
55 | } | 55 | } |
56 | 56 | ||
57 | /* IMIPR2 CP6 R10 Page 1 | 57 | /* IMIPR2 CP6 R10 Page 1 |
58 | */ | 58 | */ |
59 | static inline u32 read_imipr_2(void) | 59 | static u32 read_imipr_2(void) |
60 | { | 60 | { |
61 | u32 val; | 61 | u32 val; |
62 | asm volatile("mrc p6, 0, %0, c10, c1, 0":"=r" (val)); | 62 | asm volatile("mrc p6, 0, %0, c10, c1, 0":"=r" (val)); |
63 | return val; | 63 | return val; |
64 | } | 64 | } |
65 | static inline void write_imipr_2(u32 val) | 65 | static void write_imipr_2(u32 val) |
66 | { | 66 | { |
67 | asm volatile("mcr p6, 0, %0, c10, c1, 0"::"r" (val)); | 67 | asm volatile("mcr p6, 0, %0, c10, c1, 0"::"r" (val)); |
68 | } | 68 | } |
69 | 69 | ||
70 | /* IMIPR3 CP6 R11 Page 1 | 70 | /* IMIPR3 CP6 R11 Page 1 |
71 | */ | 71 | */ |
72 | static inline u32 read_imipr_3(void) | 72 | static u32 read_imipr_3(void) |
73 | { | 73 | { |
74 | u32 val; | 74 | u32 val; |
75 | asm volatile("mrc p6, 0, %0, c11, c1, 0":"=r" (val)); | 75 | asm volatile("mrc p6, 0, %0, c11, c1, 0":"=r" (val)); |
76 | return val; | 76 | return val; |
77 | } | 77 | } |
78 | static inline void write_imipr_3(u32 val) | 78 | static void write_imipr_3(u32 val) |
79 | { | 79 | { |
80 | asm volatile("mcr p6, 0, %0, c11, c1, 0"::"r" (val)); | 80 | asm volatile("mcr p6, 0, %0, c11, c1, 0"::"r" (val)); |
81 | } | 81 | } |
@@ -190,5 +190,5 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) | |||
190 | write_msi_msg(irq, &msg); | 190 | write_msi_msg(irq, &msg); |
191 | set_irq_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq); | 191 | set_irq_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq); |
192 | 192 | ||
193 | return irq; | 193 | return 0; |
194 | } | 194 | } |