leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: fbdev: aty: Fix set but not used warnings in mach64_ct

Browse Source 
Fix W=1 warnings about variables assigned but never used.
- One variable is only used when CONFIG_FB_ATY_GENERIC_LCD is defined
  Fix so variable is only defined with CONFIG_FB_ATY_GENERIC_LCD
- Several variables was only assigned by a call to aty_ld_le32().
  Drop the variables but keep the call to aty_ld_le32() as it may
  have unexpected side-effects.

v2:
  - Updated subject (Lee)

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Lee Jones <lee.jones@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201128224114.1033617-7-sam@ravnborg.org
This commit is contained in:
Sam Ravnborg
2020-11-28 23:40:52 +01:00
parent 5800545626
commit 0556461376
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/fbdev/aty/mach64_ct.c
View File

@@ -281,10 +281,13 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl
void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll) void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
u32 crtc_gen_cntl, lcd_gen_cntrl; u32 crtc_gen_cntl;
u8 tmp, tmp2; u8 tmp, tmp2;
lcd_gen_cntrl = 0; #ifdef CONFIG_FB_ATY_GENERIC_LCD
u32 lcd_gen_cntrl = 0;
#endif
#ifdef DEBUG #ifdef DEBUG
printk("atyfb(%s): about to program:\n" printk("atyfb(%s): about to program:\n"
"pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n", "pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n",
@@ -402,7 +405,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 mpost_div, xpost_div, sclk_post_div_real; u8 mpost_div, xpost_div, sclk_post_div_real;
u32 q, memcntl, trp; u32 q, memcntl, trp;
u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off; u32 dsp_config;
#ifdef DEBUG #ifdef DEBUG
int pllmclk, pllsclk; int pllmclk, pllsclk;
#endif #endif
@@ -488,9 +491,9 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
/* Allow BIOS to override */ /* Allow BIOS to override */
dsp_config = aty_ld_le32(DSP_CONFIG, par); dsp_config = aty_ld_le32(DSP_CONFIG, par);
dsp_on_off = aty_ld_le32(DSP_ON_OFF, par); aty_ld_le32(DSP_ON_OFF, par);
vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par); aty_ld_le32(VGA_DSP_CONFIG, par);
vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par); aty_ld_le32(VGA_DSP_ON_OFF, par);
if (dsp_config) if (dsp_config)
pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16; pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16;