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

Commit 7999d8d7 authored Jun 25, 2006 by Russell King Committed by Russell King Jun 25, 2006

[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>

parent dfd8317d

arch/arm/kernel/entry-common.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ sys_mmap2:
		streq r5, [sp, #4]
		beq do_mmap2
		mov r0, #-EINVAL
		RETINSTR(mov,pc, lr)
		mov pc, lr
		#else
		str r5, [sp, #4]
		b do_mmap2

arch/arm/lib/delay.S

+9 −9

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06
		mov r2, r2, lsr #10 @ max = 0x00007fff
		mul r0, r2, r0 @ max = 2^32-1
		movs r0, r0, lsr #6
		RETINSTR(moveq,pc,lr)
		moveq pc, lr

		/*
		* loops = r0 * HZ * loops_per_jiffy / 1000000
		@@ -43,20 +43,20 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06
		ENTRY(__delay)
		subs r0, r0, #1
		#if 0
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		RETINSTR(movls,pc,lr)
		movls pc, lr
		subs r0, r0, #1
		#endif
		bhi __delay
		RETINSTR(mov,pc,lr)
		mov pc, lr

arch/arm/lib/findbit.S

+5 −5

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ ENTRY(_find_first_zero_bit_le)
		2: cmp r2, r1 @ any more?
		blo 1b
		3: mov r0, r1 @ no free bits
		RETINSTR(mov,pc,lr)
		mov pc, lr

		/*
		* Purpose : Find next 'zero' bit
		@@ -66,7 +66,7 @@ ENTRY(_find_first_bit_le)
		2: cmp r2, r1 @ any more?
		blo 1b
		3: mov r0, r1 @ no free bits
		RETINSTR(mov,pc,lr)
		mov pc, lr

		/*
		* Purpose : Find next 'one' bit
		@@ -98,7 +98,7 @@ ENTRY(_find_first_zero_bit_be)
		2: cmp r2, r1 @ any more?
		blo 1b
		3: mov r0, r1 @ no free bits
		RETINSTR(mov,pc,lr)
		mov pc, lr

		ENTRY(_find_next_zero_bit_be)
		teq r1, #0
		@@ -126,7 +126,7 @@ ENTRY(_find_first_bit_be)
		2: cmp r2, r1 @ any more?
		blo 1b
		3: mov r0, r1 @ no free bits
		RETINSTR(mov,pc,lr)
		mov pc, lr

		ENTRY(_find_next_bit_be)
		teq r1, #0
		@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be)
		addeq r2, r2, #1
		mov r0, r2
		#endif
		RETINSTR(mov,pc,lr)
		mov pc, lr

arch/arm/lib/io-readsw-armv3.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		strb r3, [r1], #1

		subs r2, r2, #1
		RETINSTR(moveq, pc, lr)
		moveq pc, lr

		ENTRY(__raw_readsw)
		teq r2, #0 @ do we have to check for the zero len?

arch/arm/lib/io-writesw-armv3.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		orr r3, r3, r3, lsl #16
		str r3, [r0]
		subs r2, r2, #1
		RETINSTR(moveq, pc, lr)
		moveq pc, lr

		ENTRY(__raw_writesw)
		teq r2, #0 @ do we have to check for the zero len?