AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

m68k: atari: Rename shifter to shifter_st to avoid conflict

Browse Source 
When test-compiling the BCM2835 pin control driver on m68k:

    In file included from arch/m68k/include/asm/io_mm.h:32:0,
                     from arch/m68k/include/asm/io.h:8,
                     from include/linux/io.h:13,
                     from include/linux/irq.h:20,
                     from include/linux/gpio/driver.h:7,
                     from drivers/pinctrl/bcm/pinctrl-bcm2835.c:17:
    drivers/pinctrl/bcm/pinctrl-bcm2835.c: In function 'bcm2711_pull_config_set':
    arch/m68k/include/asm/atarihw.h:190:22: error: expected identifier or '(' before 'volatile'
     # define shifter ((*(volatile struct SHIFTER *)SHF_BAS))

"shifter" is a too generic name for a global definition.

As the corresponding definition for Atari TT is already called
"shifter_tt", fix this by renaming the definition for Atari ST to
"shifter_st".

Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2019-08-12 08:23:48 +02:00
parent 94c0439022
commit 053b514295
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/m68k/atari/config.c
View File

@ -246,9 +246,9 @@ void __init config_atari(void)
} else if (hwreg_present(tt_palette)) { } else if (hwreg_present(tt_palette)) {
ATARIHW_SET(TT_SHIFTER); ATARIHW_SET(TT_SHIFTER);
pr_cont(" TT_SHIFTER"); pr_cont(" TT_SHIFTER");
} else if (hwreg_present(&shifter.bas_hi)) { } else if (hwreg_present(&shifter_st.bas_hi)) {
if (hwreg_present(&shifter.bas_lo) && if (hwreg_present(&shifter_st.bas_lo) &&
(shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) { (shifter_st.bas_lo = 0x0aau, shifter_st.bas_lo == 0x0aau)) {
ATARIHW_SET(EXTD_SHIFTER); ATARIHW_SET(EXTD_SHIFTER);
pr_cont(" EXTD_SHIFTER"); pr_cont(" EXTD_SHIFTER");
} else { } else {

4
arch/m68k/include/asm/atarihw.h
View File

@ -161,7 +161,7 @@ static inline void dma_cache_maintenance( unsigned long paddr,
#define TT_HIGH 6 #define TT_HIGH 6
#define SHF_BAS (0xffff8200) #define SHF_BAS (0xffff8200)
struct SHIFTER struct SHIFTER_ST
{ {
u_char pad1; u_char pad1;
u_char bas_hi; u_char bas_hi;
@ -178,7 +178,7 @@ struct SHIFTER
u_char pad7; u_char pad7;
u_char bas_lo; u_char bas_lo;
}; };
# define shifter ((*(volatile struct SHIFTER *)SHF_BAS)) # define shifter_st ((*(volatile struct SHIFTER_ST *)SHF_BAS))
#define SHF_FBAS (0xffff820e) #define SHF_FBAS (0xffff820e)
struct SHIFTER_F030 struct SHIFTER_F030

42
drivers/video/fbdev/atafb.c
View File

@ -763,17 +763,17 @@ static void tt_get_par(struct atafb_par *par)
{ {
unsigned long addr; unsigned long addr;
par->hw.tt.mode = shifter_tt.tt_shiftmode; par->hw.tt.mode = shifter_tt.tt_shiftmode;
par->hw.tt.sync = shifter.syncmode; par->hw.tt.sync = shifter_st.syncmode;
addr = ((shifter.bas_hi & 0xff) << 16) | addr = ((shifter_st.bas_hi & 0xff) << 16) |
((shifter.bas_md & 0xff) << 8) | ((shifter_st.bas_md & 0xff) << 8) |
((shifter.bas_lo & 0xff)); ((shifter_st.bas_lo & 0xff));
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
} }
static void tt_set_par(struct atafb_par *par) static void tt_set_par(struct atafb_par *par)
{ {
shifter_tt.tt_shiftmode = par->hw.tt.mode; shifter_tt.tt_shiftmode = par->hw.tt.mode;
shifter.syncmode = par->hw.tt.sync; shifter_st.syncmode = par->hw.tt.sync;
/* only set screen_base if really necessary */ /* only set screen_base if really necessary */
if (current_par.screen_base != par->screen_base) if (current_par.screen_base != par->screen_base)
fbhw->set_screen_base(par->screen_base); fbhw->set_screen_base(par->screen_base);
@ -1543,7 +1543,7 @@ static void falcon_get_par(struct atafb_par *par)
hw->f_shift = videl.f_shift; hw->f_shift = videl.f_shift;
hw->vid_control = videl.control; hw->vid_control = videl.control;
hw->vid_mode = videl.mode; hw->vid_mode = videl.mode;
hw->sync = shifter.syncmode & 0x1; hw->sync = shifter_st.syncmode & 0x1;
hw->xoffset = videl.xoffset & 0xf; hw->xoffset = videl.xoffset & 0xf;
hw->hht = videl.hht; hw->hht = videl.hht;
hw->hbb = videl.hbb; hw->hbb = videl.hbb;
@ -1558,9 +1558,9 @@ static void falcon_get_par(struct atafb_par *par)
hw->vde = videl.vde; hw->vde = videl.vde;
hw->vss = videl.vss; hw->vss = videl.vss;
addr = (shifter.bas_hi & 0xff) << 16 | addr = (shifter_st.bas_hi & 0xff) << 16 |
(shifter.bas_md & 0xff) << 8 | (shifter_st.bas_md & 0xff) << 8 |
(shifter.bas_lo & 0xff); (shifter_st.bas_lo & 0xff);
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
/* derived parameters */ /* derived parameters */
@ -1605,7 +1605,7 @@ static irqreturn_t falcon_vbl_switcher(int irq, void *dummy)
/* Turn off external clocks. Read sets all output bits to 1. */ /* Turn off external clocks. Read sets all output bits to 1. */
*(volatile unsigned short *)0xffff9202; *(volatile unsigned short *)0xffff9202;
} }
shifter.syncmode = hw->sync; shifter_st.syncmode = hw->sync;
videl.hht = hw->hht; videl.hht = hw->hht;
videl.hbb = hw->hbb; videl.hbb = hw->hbb;
@ -1952,18 +1952,18 @@ static void stste_get_par(struct atafb_par *par)
{ {
unsigned long addr; unsigned long addr;
par->hw.st.mode = shifter_tt.st_shiftmode; par->hw.st.mode = shifter_tt.st_shiftmode;
par->hw.st.sync = shifter.syncmode; par->hw.st.sync = shifter_st.syncmode;
addr = ((shifter.bas_hi & 0xff) << 16) | addr = ((shifter_st.bas_hi & 0xff) << 16) |
((shifter.bas_md & 0xff) << 8); ((shifter_st.bas_md & 0xff) << 8);
if (ATARIHW_PRESENT(EXTD_SHIFTER)) if (ATARIHW_PRESENT(EXTD_SHIFTER))
addr |= (shifter.bas_lo & 0xff); addr |= (shifter_st.bas_lo & 0xff);
par->screen_base = atari_stram_to_virt(addr); par->screen_base = atari_stram_to_virt(addr);
} }
static void stste_set_par(struct atafb_par *par) static void stste_set_par(struct atafb_par *par)
{ {
shifter_tt.st_shiftmode = par->hw.st.mode; shifter_tt.st_shiftmode = par->hw.st.mode;
shifter.syncmode = par->hw.st.sync; shifter_st.syncmode = par->hw.st.sync;
/* only set screen_base if really necessary */ /* only set screen_base if really necessary */
if (current_par.screen_base != par->screen_base) if (current_par.screen_base != par->screen_base)
fbhw->set_screen_base(par->screen_base); fbhw->set_screen_base(par->screen_base);
@ -2018,10 +2018,10 @@ static void stste_set_screen_base(void *s_base)
unsigned long addr; unsigned long addr;
addr = atari_stram_to_phys(s_base); addr = atari_stram_to_phys(s_base);
/* Setup Screen Memory */ /* Setup Screen Memory */
shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16); shifter_st.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8); shifter_st.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
if (ATARIHW_PRESENT(EXTD_SHIFTER)) if (ATARIHW_PRESENT(EXTD_SHIFTER))
shifter.bas_lo = (unsigned char)(addr & 0x0000ff); shifter_st.bas_lo = (unsigned char)(addr & 0x0000ff);
} }
#endif /* ATAFB_STE */ #endif /* ATAFB_STE */
@ -2265,9 +2265,9 @@ static void set_screen_base(void *s_base)
addr = atari_stram_to_phys(s_base); addr = atari_stram_to_phys(s_base);
/* Setup Screen Memory */ /* Setup Screen Memory */
shifter.bas_hi = (unsigned char)((addr & 0xff0000) >> 16); shifter_st.bas_hi = (unsigned char)((addr & 0xff0000) >> 16);
shifter.bas_md = (unsigned char)((addr & 0x00ff00) >> 8); shifter_st.bas_md = (unsigned char)((addr & 0x00ff00) >> 8);
shifter.bas_lo = (unsigned char)(addr & 0x0000ff); shifter_st.bas_lo = (unsigned char)(addr & 0x0000ff);
} }
static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info) static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info)