Skip to content

Commit 72fb838

Browse files
arndbksacilotto
authored andcommitted
ARM: s3c: fix fiq for clang IAS
BugLink: https://bugs.launchpad.net/bugs/1918974 [ Upstream commit 7f9942c ] 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 <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/20210204162416.3030114-1-arnd@kernel.org Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 20a1368 commit 72fb838

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/spi/spi-s3c24xx-fiq.S

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

3535
ENTRY(s3c24xx_spi_fiq_rx)
36-
s3c24xx_spi_fix_rx:
3736
.word fiq_rx_end - fiq_rx_start
3837
.word fiq_rx_irq_ack - fiq_rx_start
3938
fiq_rx_start:
@@ -47,7 +46,7 @@ fiq_rx_start:
4746
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
4847

4948
subs fiq_rcount, fiq_rcount, #1
50-
subnes pc, lr, #4 @@ return, still have work to do
49+
subsne pc, lr, #4 @@ return, still have work to do
5150

5251
@@ set IRQ controller so that next op will trigger IRQ
5352
mov fiq_rtmp, #0
@@ -59,7 +58,6 @@ fiq_rx_irq_ack:
5958
fiq_rx_end:
6059

6160
ENTRY(s3c24xx_spi_fiq_txrx)
62-
s3c24xx_spi_fiq_txrx:
6361
.word fiq_txrx_end - fiq_txrx_start
6462
.word fiq_txrx_irq_ack - fiq_txrx_start
6563
fiq_txrx_start:
@@ -74,7 +72,7 @@ fiq_txrx_start:
7472
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
7573

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

7977
mov fiq_rtmp, #0
8078
str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ]
@@ -86,7 +84,6 @@ fiq_txrx_irq_ack:
8684
fiq_txrx_end:
8785

8886
ENTRY(s3c24xx_spi_fiq_tx)
89-
s3c24xx_spi_fix_tx:
9087
.word fiq_tx_end - fiq_tx_start
9188
.word fiq_tx_irq_ack - fiq_tx_start
9289
fiq_tx_start:
@@ -99,7 +96,7 @@ fiq_tx_start:
9996
strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ]
10097

10198
subs fiq_rcount, fiq_rcount, #1
102-
subnes pc, lr, #4 @@ return, still have work to do
99+
subsne pc, lr, #4 @@ return, still have work to do
103100

104101
mov fiq_rtmp, #0
105102
str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ]

0 commit comments

Comments
 (0)