[PATCH 03/31] video: fbdev: aty: atyfb_base: Remove superfluous code surrounding 'dac_type'

From: Lee Jones
Date: Wed Jan 13 2021 - 09:51:25 EST


If used, 'dac_type' is overwritten in the '#ifdef CONFIG_ATARI' clause.

It's also not used after the last assignment, so we'll rid that too.

Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Cc: Vaibhav Gupta <vaibhavgupta40@xxxxxxxxx>
Cc: Alex Kern <alex.kern@xxxxxx>
Cc: "Eddie C. Dost" <ecd@xxxxxxxxx>
Cc: Anthony Tong <atong@xxxxxxxx>
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: linux-fbdev@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/video/fbdev/aty/atyfb_base.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index c8feff0ee8da9..11c328f0585ce 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -2365,8 +2365,6 @@ static int aty_init(struct fb_info *info)
par->bus_type = (stat0 >> 0) & 0x07;
par->ram_type = (stat0 >> 3) & 0x07;
ramname = aty_gx_ram[par->ram_type];
- /* FIXME: clockchip/RAMDAC probing? */
- dac_type = (aty_ld_le32(DAC_CNTL, par) >> 16) & 0x07;
#ifdef CONFIG_ATARI
clk_type = CLK_ATI18818_1;
dac_type = (stat0 >> 9) & 0x07;
@@ -2375,7 +2373,6 @@ static int aty_init(struct fb_info *info)
else
dac_subtype = (aty_ld_8(SCRATCH_REG1 + 1, par) & 0xF0) | dac_type;
#else
- dac_type = DAC_IBMRGB514;
dac_subtype = DAC_IBMRGB514;
clk_type = CLK_IBMRGB514;
#endif
--
2.25.1