Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k/atari: Rename "scc" to "atari_scc"

It's a way too generic name for a global #define and conflicts with a variable
with the same name, causing build errors like:

| drivers/staging/brcm80211/brcmfmac/../util/siutils.c: In function ‘_si_clkctl_cc’:
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected identifier or ‘(’ before ‘volatile’
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected ‘)’ before ‘(’ token
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1421: error: incompatible types in assignment
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1422: error: invalid operands to binary &
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1423: error: invalid operands to binary &
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1424: error: invalid operands to binary |
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: incompatible type for argument 4 of ‘bcmsdh_reg_write’
| drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1428: error: invalid operands to binary &
| make[8]: *** [drivers/staging/brcm80211/brcmfmac/../util/siutils.o] Error 1

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

+11 -11
+2 -2
arch/m68k/atari/ataints.c
··· 388 388 } 389 389 390 390 if (ATARIHW_PRESENT(SCC) && !atari_SCC_reset_done) { 391 - scc.cha_a_ctrl = 9; 391 + atari_scc.cha_a_ctrl = 9; 392 392 MFPDELAY(); 393 - scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */ 393 + atari_scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */ 394 394 } 395 395 396 396 if (ATARIHW_PRESENT(SCU)) {
+1 -1
arch/m68k/atari/config.c
··· 315 315 ATARIHW_SET(SCC_DMA); 316 316 printk("SCC_DMA "); 317 317 } 318 - if (scc_test(&scc.cha_a_ctrl)) { 318 + if (scc_test(&atari_scc.cha_a_ctrl)) { 319 319 ATARIHW_SET(SCC); 320 320 printk("SCC "); 321 321 }
+7 -7
arch/m68k/atari/debug.c
··· 53 53 { 54 54 do { 55 55 MFPDELAY(); 56 - } while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */ 56 + } while (!(atari_scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */ 57 57 MFPDELAY(); 58 - scc.cha_b_data = c; 58 + atari_scc.cha_b_data = c; 59 59 } 60 60 61 61 static void atari_scc_console_write(struct console *co, const char *str, ··· 140 140 { 141 141 do { 142 142 MFPDELAY(); 143 - } while (!(scc.cha_b_ctrl & 0x01)); /* wait for rx buf filled */ 143 + } while (!(atari_scc.cha_b_ctrl & 0x01)); /* wait for rx buf filled */ 144 144 MFPDELAY(); 145 - return scc.cha_b_data; 145 + return atari_scc.cha_b_data; 146 146 } 147 147 148 148 int atari_midi_console_wait_key(struct console *co) ··· 185 185 186 186 #define SCC_WRITE(reg, val) \ 187 187 do { \ 188 - scc.cha_b_ctrl = (reg); \ 188 + atari_scc.cha_b_ctrl = (reg); \ 189 189 MFPDELAY(); \ 190 - scc.cha_b_ctrl = (val); \ 190 + atari_scc.cha_b_ctrl = (val); \ 191 191 MFPDELAY(); \ 192 192 } while (0) 193 193 ··· 240 240 reg3 = (cflag & CSIZE) == CS8 ? 0xc0 : 0x40; 241 241 reg5 = (cflag & CSIZE) == CS8 ? 0x60 : 0x20 | 0x82 /* assert DTR/RTS */; 242 242 243 - (void)scc.cha_b_ctrl; /* reset reg pointer */ 243 + (void)atari_scc.cha_b_ctrl; /* reset reg pointer */ 244 244 SCC_WRITE(9, 0xc0); /* reset */ 245 245 LONG_DELAY(); /* extra delay after WR9 access */ 246 246 SCC_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03)
+1 -1
arch/m68k/include/asm/atarihw.h
··· 449 449 u_char char_dummy3; 450 450 u_char cha_b_data; 451 451 }; 452 - # define scc ((*(volatile struct SCC*)SCC_BAS)) 452 + # define atari_scc ((*(volatile struct SCC*)SCC_BAS)) 453 453 454 454 /* The ESCC (Z85230) in an Atari ST. The channels are reversed! */ 455 455 # define st_escc ((*(volatile struct SCC*)0xfffffa31))