Skip to content

Commit 7f9942c

Browse files
arndbkrzk
authored andcommitted
ARM: s3c: fix fiq for clang IAS
Building with the clang integrated assembler produces a couple of errors for the s3c24xx fiq support: arch/arm/mach-s3c/irq-s3c24xx-fiq.S:52:2: error: instruction 'subne' can not set flags, but 's' suffix specified subnes pc, lr, #4 @@ return, still have work to do arch/arm/mach-s3c/irq-s3c24xx-fiq.S:64:1: error: invalid symbol redefinition s3c24xx_spi_fiq_txrx: There are apparently two problems: one with extraneous or duplicate labels, and one with old-style opcode mnemonics. Stefan Agner has previously fixed other problems like this, but missed this particular file. Fixes: bec0806 ("spi_s3c24xx: add FIQ pseudo-DMA support") Cc: Stefan Agner <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 5c8fe58 commit 7f9942c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

arch/arm/mach-s3c/irq-s3c24xx-fiq.S

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
@ and an offset to the irq acknowledgment word
3636

3737
ENTRY(s3c24xx_spi_fiq_rx)
38-
s3c24xx_spi_fix_rx:
3938
.word fiq_rx_end - fiq_rx_start
4039
.word fiq_rx_irq_ack - fiq_rx_start
4140
fiq_rx_start:
@@ -49,7 +48,7 @@ fiq_rx_start:
4948
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
5049

5150
subs fiq_rcount, fiq_rcount, #1
52-
subnes pc, lr, #4 @@ return, still have work to do
51+
subsne pc, lr, #4 @@ return, still have work to do
5352

5453
@@ set IRQ controller so that next op will trigger IRQ
5554
mov fiq_rtmp, #0
@@ -61,7 +60,6 @@ fiq_rx_irq_ack:
6160
fiq_rx_end:
6261

6362
ENTRY(s3c24xx_spi_fiq_txrx)
64-
s3c24xx_spi_fiq_txrx:
6563
.word fiq_txrx_end - fiq_txrx_start
6664
.word fiq_txrx_irq_ack - fiq_txrx_start
6765
fiq_txrx_start:
@@ -76,7 +74,7 @@ fiq_txrx_start:
7674
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
7775

7876
subs fiq_rcount, fiq_rcount, #1
79-
subnes pc, lr, #4 @@ return, still have work to do
77+
subsne pc, lr, #4 @@ return, still have work to do
8078

8179
mov fiq_rtmp, #0
8280
str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ]
@@ -88,7 +86,6 @@ fiq_txrx_irq_ack:
8886
fiq_txrx_end:
8987

9088
ENTRY(s3c24xx_spi_fiq_tx)
91-
s3c24xx_spi_fix_tx:
9289
.word fiq_tx_end - fiq_tx_start
9390
.word fiq_tx_irq_ack - fiq_tx_start
9491
fiq_tx_start:
@@ -101,7 +98,7 @@ fiq_tx_start:
10198
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
10299

103100
subs fiq_rcount, fiq_rcount, #1
104-
subnes pc, lr, #4 @@ return, still have work to do
101+
subsne pc, lr, #4 @@ return, still have work to do
105102

106103
mov fiq_rtmp, #0
107104
str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ]

0 commit comments

Comments
 (0)