diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-25 06:17:23 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-25 06:17:23 -0400 |
commit | 7999d8d7a611bee902446939952859caf1367c25 (patch) | |
tree | 98dd4b81951f25b60012f2d91203fab3e0fd9010 /arch | |
parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) |
[ARM] Remove RETINSTR macro
RETINSTR is a left-over from the days when we had 26-bit and
32-bit CPU support integrated into the same tree. Since this
is no longer the case, we can now remove RETINSTR.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/entry-common.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/delay.S | 18 | ||||
-rw-r--r-- | arch/arm/lib/findbit.S | 10 | ||||
-rw-r--r-- | arch/arm/lib/io-readsw-armv3.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/io-writesw-armv3.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/memchr.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/memset.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/memzero.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/strchr.S | 2 | ||||
-rw-r--r-- | arch/arm/lib/strrchr.S | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index b5bcebca1cd6..75af6d6e2f28 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -340,7 +340,7 @@ sys_mmap2: | |||
340 | streq r5, [sp, #4] | 340 | streq r5, [sp, #4] |
341 | beq do_mmap2 | 341 | beq do_mmap2 |
342 | mov r0, #-EINVAL | 342 | mov r0, #-EINVAL |
343 | RETINSTR(mov,pc, lr) | 343 | mov pc, lr |
344 | #else | 344 | #else |
345 | str r5, [sp, #4] | 345 | str r5, [sp, #4] |
346 | b do_mmap2 | 346 | b do_mmap2 |
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S index 9183b06c0e2f..930a70259220 100644 --- a/arch/arm/lib/delay.S +++ b/arch/arm/lib/delay.S | |||
@@ -31,7 +31,7 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06 | |||
31 | mov r2, r2, lsr #10 @ max = 0x00007fff | 31 | mov r2, r2, lsr #10 @ max = 0x00007fff |
32 | mul r0, r2, r0 @ max = 2^32-1 | 32 | mul r0, r2, r0 @ max = 2^32-1 |
33 | movs r0, r0, lsr #6 | 33 | movs r0, r0, lsr #6 |
34 | RETINSTR(moveq,pc,lr) | 34 | moveq pc, lr |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * loops = r0 * HZ * loops_per_jiffy / 1000000 | 37 | * loops = r0 * HZ * loops_per_jiffy / 1000000 |
@@ -43,20 +43,20 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06 | |||
43 | ENTRY(__delay) | 43 | ENTRY(__delay) |
44 | subs r0, r0, #1 | 44 | subs r0, r0, #1 |
45 | #if 0 | 45 | #if 0 |
46 | RETINSTR(movls,pc,lr) | 46 | movls pc, lr |
47 | subs r0, r0, #1 | 47 | subs r0, r0, #1 |
48 | RETINSTR(movls,pc,lr) | 48 | movls pc, lr |
49 | subs r0, r0, #1 | 49 | subs r0, r0, #1 |
50 | RETINSTR(movls,pc,lr) | 50 | movls pc, lr |
51 | subs r0, r0, #1 | 51 | subs r0, r0, #1 |
52 | RETINSTR(movls,pc,lr) | 52 | movls pc, lr |
53 | subs r0, r0, #1 | 53 | subs r0, r0, #1 |
54 | RETINSTR(movls,pc,lr) | 54 | movls pc, lr |
55 | subs r0, r0, #1 | 55 | subs r0, r0, #1 |
56 | RETINSTR(movls,pc,lr) | 56 | movls pc, lr |
57 | subs r0, r0, #1 | 57 | subs r0, r0, #1 |
58 | RETINSTR(movls,pc,lr) | 58 | movls pc, lr |
59 | subs r0, r0, #1 | 59 | subs r0, r0, #1 |
60 | #endif | 60 | #endif |
61 | bhi __delay | 61 | bhi __delay |
62 | RETINSTR(mov,pc,lr) | 62 | mov pc, lr |
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S index 6f8e27a58c78..a5ca0248aa4e 100644 --- a/arch/arm/lib/findbit.S +++ b/arch/arm/lib/findbit.S | |||
@@ -32,7 +32,7 @@ ENTRY(_find_first_zero_bit_le) | |||
32 | 2: cmp r2, r1 @ any more? | 32 | 2: cmp r2, r1 @ any more? |
33 | blo 1b | 33 | blo 1b |
34 | 3: mov r0, r1 @ no free bits | 34 | 3: mov r0, r1 @ no free bits |
35 | RETINSTR(mov,pc,lr) | 35 | mov pc, lr |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Purpose : Find next 'zero' bit | 38 | * Purpose : Find next 'zero' bit |
@@ -66,7 +66,7 @@ ENTRY(_find_first_bit_le) | |||
66 | 2: cmp r2, r1 @ any more? | 66 | 2: cmp r2, r1 @ any more? |
67 | blo 1b | 67 | blo 1b |
68 | 3: mov r0, r1 @ no free bits | 68 | 3: mov r0, r1 @ no free bits |
69 | RETINSTR(mov,pc,lr) | 69 | mov pc, lr |
70 | 70 | ||
71 | /* | 71 | /* |
72 | * Purpose : Find next 'one' bit | 72 | * Purpose : Find next 'one' bit |
@@ -98,7 +98,7 @@ ENTRY(_find_first_zero_bit_be) | |||
98 | 2: cmp r2, r1 @ any more? | 98 | 2: cmp r2, r1 @ any more? |
99 | blo 1b | 99 | blo 1b |
100 | 3: mov r0, r1 @ no free bits | 100 | 3: mov r0, r1 @ no free bits |
101 | RETINSTR(mov,pc,lr) | 101 | mov pc, lr |
102 | 102 | ||
103 | ENTRY(_find_next_zero_bit_be) | 103 | ENTRY(_find_next_zero_bit_be) |
104 | teq r1, #0 | 104 | teq r1, #0 |
@@ -126,7 +126,7 @@ ENTRY(_find_first_bit_be) | |||
126 | 2: cmp r2, r1 @ any more? | 126 | 2: cmp r2, r1 @ any more? |
127 | blo 1b | 127 | blo 1b |
128 | 3: mov r0, r1 @ no free bits | 128 | 3: mov r0, r1 @ no free bits |
129 | RETINSTR(mov,pc,lr) | 129 | mov pc, lr |
130 | 130 | ||
131 | ENTRY(_find_next_bit_be) | 131 | ENTRY(_find_next_bit_be) |
132 | teq r1, #0 | 132 | teq r1, #0 |
@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be) | |||
164 | addeq r2, r2, #1 | 164 | addeq r2, r2, #1 |
165 | mov r0, r2 | 165 | mov r0, r2 |
166 | #endif | 166 | #endif |
167 | RETINSTR(mov,pc,lr) | 167 | mov pc, lr |
168 | 168 | ||
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S index 146d47c15455..2639983219b9 100644 --- a/arch/arm/lib/io-readsw-armv3.S +++ b/arch/arm/lib/io-readsw-armv3.S | |||
@@ -28,7 +28,7 @@ | |||
28 | strb r3, [r1], #1 | 28 | strb r3, [r1], #1 |
29 | 29 | ||
30 | subs r2, r2, #1 | 30 | subs r2, r2, #1 |
31 | RETINSTR(moveq, pc, lr) | 31 | moveq pc, lr |
32 | 32 | ||
33 | ENTRY(__raw_readsw) | 33 | ENTRY(__raw_readsw) |
34 | teq r2, #0 @ do we have to check for the zero len? | 34 | teq r2, #0 @ do we have to check for the zero len? |
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index 52d62b481295..c421f92eeb27 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S | |||
@@ -29,7 +29,7 @@ | |||
29 | orr r3, r3, r3, lsl #16 | 29 | orr r3, r3, r3, lsl #16 |
30 | str r3, [r0] | 30 | str r3, [r0] |
31 | subs r2, r2, #1 | 31 | subs r2, r2, #1 |
32 | RETINSTR(moveq, pc, lr) | 32 | moveq pc, lr |
33 | 33 | ||
34 | ENTRY(__raw_writesw) | 34 | ENTRY(__raw_writesw) |
35 | teq r2, #0 @ do we have to check for the zero len? | 35 | teq r2, #0 @ do we have to check for the zero len? |
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S index ac34fe55d21a..e7ab1ea8ebaa 100644 --- a/arch/arm/lib/memchr.S +++ b/arch/arm/lib/memchr.S | |||
@@ -22,4 +22,4 @@ ENTRY(memchr) | |||
22 | bne 1b | 22 | bne 1b |
23 | sub r0, r0, #1 | 23 | sub r0, r0, #1 |
24 | 2: movne r0, #0 | 24 | 2: movne r0, #0 |
25 | RETINSTR(mov,pc,lr) | 25 | mov pc, lr |
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index a1795f599937..69e7c31f3381 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S | |||
@@ -77,4 +77,4 @@ ENTRY(memset) | |||
77 | strneb r1, [r0], #1 | 77 | strneb r1, [r0], #1 |
78 | tst r2, #1 | 78 | tst r2, #1 |
79 | strneb r1, [r0], #1 | 79 | strneb r1, [r0], #1 |
80 | RETINSTR(mov,pc,lr) | 80 | mov pc, lr |
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S index 51ccc60160fd..764e7de8bbab 100644 --- a/arch/arm/lib/memzero.S +++ b/arch/arm/lib/memzero.S | |||
@@ -77,4 +77,4 @@ ENTRY(__memzero) | |||
77 | strneb r2, [r0], #1 @ 1 | 77 | strneb r2, [r0], #1 @ 1 |
78 | tst r1, #1 @ 1 a byte left over | 78 | tst r1, #1 @ 1 a byte left over |
79 | strneb r2, [r0], #1 @ 1 | 79 | strneb r2, [r0], #1 @ 1 |
80 | RETINSTR(mov,pc,lr) @ 1 | 80 | mov pc, lr @ 1 |
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S index 5b9b493733fc..9f18d6fdee6a 100644 --- a/arch/arm/lib/strchr.S +++ b/arch/arm/lib/strchr.S | |||
@@ -23,4 +23,4 @@ ENTRY(strchr) | |||
23 | teq r2, r1 | 23 | teq r2, r1 |
24 | movne r0, #0 | 24 | movne r0, #0 |
25 | subeq r0, r0, #1 | 25 | subeq r0, r0, #1 |
26 | RETINSTR(mov,pc,lr) | 26 | mov pc, lr |
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S index fa923f026f15..538df220aa48 100644 --- a/arch/arm/lib/strrchr.S +++ b/arch/arm/lib/strrchr.S | |||
@@ -22,4 +22,4 @@ ENTRY(strrchr) | |||
22 | teq r2, #0 | 22 | teq r2, #0 |
23 | bne 1b | 23 | bne 1b |
24 | mov r0, r3 | 24 | mov r0, r3 |
25 | RETINSTR(mov,pc,lr) | 25 | mov pc, lr |