2019-07-30 22:42:25

by Souptick Joarder

[permalink] [raw]
Subject: [PATCH] video/fbdev/aty128fb: Remove dead code

This is dead code since 3.15. If there is no plan to use it
further, this can be removed forever.

Signed-off-by: Souptick Joarder <[email protected]>
---
drivers/video/fbdev/aty/aty128fb.c | 18 ------------------
drivers/video/fbdev/aty/atyfb_base.c | 29 -----------------------------
2 files changed, 47 deletions(-)

diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
index 8504e19..fc1e45d 100644
--- a/drivers/video/fbdev/aty/aty128fb.c
+++ b/drivers/video/fbdev/aty/aty128fb.c
@@ -487,11 +487,6 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
const struct aty128fb_par *par);
static int aty128_decode_var(struct fb_var_screeninfo *var,
struct aty128fb_par *par);
-#if 0
-static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);
-static void __iomem *aty128_map_ROM(struct pci_dev *pdev,
- const struct aty128fb_par *par);
-#endif
static void aty128_timings(struct aty128fb_par *par);
static void aty128_init_engine(struct aty128fb_par *par);
static void aty128_reset_engine(const struct aty128fb_par *par);
@@ -1665,19 +1660,6 @@ static void aty128_st_pal(u_int regno, u_int red, u_int green, u_int blue,
struct aty128fb_par *par)
{
if (par->chip_gen == rage_M3) {
-#if 0
- /* Note: For now, on M3, we set palette on both heads, which may
- * be useless. Can someone with a M3 check this ?
- *
- * This code would still be useful if using the second CRTC to
- * do mirroring
- */
-
- aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) |
- DAC_PALETTE_ACCESS_CNTL);
- aty_st_8(PALETTE_INDEX, regno);
- aty_st_le32(PALETTE_DATA, (red<<16)|(green<<8)|blue);
-#endif
aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &
~DAC_PALETTE_ACCESS_CNTL);
}
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 72bcfbe..6dda5d8 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -1188,19 +1188,6 @@ static int aty_crtc_to_var(const struct crtc *crtc,
(c_sync ? FB_SYNC_COMP_HIGH_ACT : 0);

switch (pix_width) {
-#if 0
- case CRTC_PIX_WIDTH_4BPP:
- bpp = 4;
- var->red.offset = 0;
- var->red.length = 8;
- var->green.offset = 0;
- var->green.length = 8;
- var->blue.offset = 0;
- var->blue.length = 8;
- var->transp.offset = 0;
- var->transp.length = 0;
- break;
-#endif
case CRTC_PIX_WIDTH_8BPP:
bpp = 8;
var->red.offset = 0;
@@ -1466,11 +1453,6 @@ static int atyfb_set_par(struct fb_info *info)
var->bits_per_pixel,
par->crtc.vxres * var->bits_per_pixel / 8);
#endif /* CONFIG_BOOTX_TEXT */
-#if 0
- /* switch to accelerator mode */
- if (!(par->crtc.gen_cntl & CRTC_EXT_DISP_EN))
- aty_st_le32(CRTC_GEN_CNTL, par->crtc.gen_cntl | CRTC_EXT_DISP_EN, par);
-#endif
#ifdef DEBUG
{
/* dump non shadow CRTC, pll, LCD registers */
@@ -2396,17 +2378,6 @@ static int aty_init(struct fb_info *info)
par->pll_ops = &aty_pll_ibm514;
break;
#endif
-#if 0 /* dead code */
- case CLK_STG1703:
- par->pll_ops = &aty_pll_stg1703;
- break;
- case CLK_CH8398:
- par->pll_ops = &aty_pll_ch8398;
- break;
- case CLK_ATT20C408:
- par->pll_ops = &aty_pll_att20c408;
- break;
-#endif
default:
PRINTKI("aty_init: CLK type not implemented yet!");
par->pll_ops = &aty_pll_unsupported;
--
1.9.1


2019-08-07 08:44:22

by Souptick Joarder

[permalink] [raw]
Subject: Re: [PATCH] video/fbdev/aty128fb: Remove dead code

On Wed, Jul 31, 2019 at 12:38 AM Souptick Joarder <[email protected]> wrote:
>
> This is dead code since 3.15. If there is no plan to use it
> further, this can be removed forever.

Any comment on this patch ?

>
> Signed-off-by: Souptick Joarder <[email protected]>
> ---
> drivers/video/fbdev/aty/aty128fb.c | 18 ------------------
> drivers/video/fbdev/aty/atyfb_base.c | 29 -----------------------------
> 2 files changed, 47 deletions(-)
>
> diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
> index 8504e19..fc1e45d 100644
> --- a/drivers/video/fbdev/aty/aty128fb.c
> +++ b/drivers/video/fbdev/aty/aty128fb.c
> @@ -487,11 +487,6 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
> const struct aty128fb_par *par);
> static int aty128_decode_var(struct fb_var_screeninfo *var,
> struct aty128fb_par *par);
> -#if 0
> -static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);
> -static void __iomem *aty128_map_ROM(struct pci_dev *pdev,
> - const struct aty128fb_par *par);
> -#endif
> static void aty128_timings(struct aty128fb_par *par);
> static void aty128_init_engine(struct aty128fb_par *par);
> static void aty128_reset_engine(const struct aty128fb_par *par);
> @@ -1665,19 +1660,6 @@ static void aty128_st_pal(u_int regno, u_int red, u_int green, u_int blue,
> struct aty128fb_par *par)
> {
> if (par->chip_gen == rage_M3) {
> -#if 0
> - /* Note: For now, on M3, we set palette on both heads, which may
> - * be useless. Can someone with a M3 check this ?
> - *
> - * This code would still be useful if using the second CRTC to
> - * do mirroring
> - */
> -
> - aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) |
> - DAC_PALETTE_ACCESS_CNTL);
> - aty_st_8(PALETTE_INDEX, regno);
> - aty_st_le32(PALETTE_DATA, (red<<16)|(green<<8)|blue);
> -#endif
> aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &
> ~DAC_PALETTE_ACCESS_CNTL);
> }
> diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
> index 72bcfbe..6dda5d8 100644
> --- a/drivers/video/fbdev/aty/atyfb_base.c
> +++ b/drivers/video/fbdev/aty/atyfb_base.c
> @@ -1188,19 +1188,6 @@ static int aty_crtc_to_var(const struct crtc *crtc,
> (c_sync ? FB_SYNC_COMP_HIGH_ACT : 0);
>
> switch (pix_width) {
> -#if 0
> - case CRTC_PIX_WIDTH_4BPP:
> - bpp = 4;
> - var->red.offset = 0;
> - var->red.length = 8;
> - var->green.offset = 0;
> - var->green.length = 8;
> - var->blue.offset = 0;
> - var->blue.length = 8;
> - var->transp.offset = 0;
> - var->transp.length = 0;
> - break;
> -#endif
> case CRTC_PIX_WIDTH_8BPP:
> bpp = 8;
> var->red.offset = 0;
> @@ -1466,11 +1453,6 @@ static int atyfb_set_par(struct fb_info *info)
> var->bits_per_pixel,
> par->crtc.vxres * var->bits_per_pixel / 8);
> #endif /* CONFIG_BOOTX_TEXT */
> -#if 0
> - /* switch to accelerator mode */
> - if (!(par->crtc.gen_cntl & CRTC_EXT_DISP_EN))
> - aty_st_le32(CRTC_GEN_CNTL, par->crtc.gen_cntl | CRTC_EXT_DISP_EN, par);
> -#endif
> #ifdef DEBUG
> {
> /* dump non shadow CRTC, pll, LCD registers */
> @@ -2396,17 +2378,6 @@ static int aty_init(struct fb_info *info)
> par->pll_ops = &aty_pll_ibm514;
> break;
> #endif
> -#if 0 /* dead code */
> - case CLK_STG1703:
> - par->pll_ops = &aty_pll_stg1703;
> - break;
> - case CLK_CH8398:
> - par->pll_ops = &aty_pll_ch8398;
> - break;
> - case CLK_ATT20C408:
> - par->pll_ops = &aty_pll_att20c408;
> - break;
> -#endif
> default:
> PRINTKI("aty_init: CLK type not implemented yet!");
> par->pll_ops = &aty_pll_unsupported;
> --
> 1.9.1
>

2019-08-14 12:25:40

by Souptick Joarder

[permalink] [raw]
Subject: Re: [PATCH] video/fbdev/aty128fb: Remove dead code

On Wed, Aug 7, 2019 at 2:12 PM Souptick Joarder <[email protected]> wrote:
>
> On Wed, Jul 31, 2019 at 12:38 AM Souptick Joarder <[email protected]> wrote:
> >
> > This is dead code since 3.15. If there is no plan to use it
> > further, this can be removed forever.
>
> Any comment on this patch ?

Any comment on this patch ?

>
> >
> > Signed-off-by: Souptick Joarder <[email protected]>
> > ---
> > drivers/video/fbdev/aty/aty128fb.c | 18 ------------------
> > drivers/video/fbdev/aty/atyfb_base.c | 29 -----------------------------
> > 2 files changed, 47 deletions(-)
> >
> > diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
> > index 8504e19..fc1e45d 100644
> > --- a/drivers/video/fbdev/aty/aty128fb.c
> > +++ b/drivers/video/fbdev/aty/aty128fb.c
> > @@ -487,11 +487,6 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
> > const struct aty128fb_par *par);
> > static int aty128_decode_var(struct fb_var_screeninfo *var,
> > struct aty128fb_par *par);
> > -#if 0
> > -static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);
> > -static void __iomem *aty128_map_ROM(struct pci_dev *pdev,
> > - const struct aty128fb_par *par);
> > -#endif
> > static void aty128_timings(struct aty128fb_par *par);
> > static void aty128_init_engine(struct aty128fb_par *par);
> > static void aty128_reset_engine(const struct aty128fb_par *par);
> > @@ -1665,19 +1660,6 @@ static void aty128_st_pal(u_int regno, u_int red, u_int green, u_int blue,
> > struct aty128fb_par *par)
> > {
> > if (par->chip_gen == rage_M3) {
> > -#if 0
> > - /* Note: For now, on M3, we set palette on both heads, which may
> > - * be useless. Can someone with a M3 check this ?
> > - *
> > - * This code would still be useful if using the second CRTC to
> > - * do mirroring
> > - */
> > -
> > - aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) |
> > - DAC_PALETTE_ACCESS_CNTL);
> > - aty_st_8(PALETTE_INDEX, regno);
> > - aty_st_le32(PALETTE_DATA, (red<<16)|(green<<8)|blue);
> > -#endif
> > aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &
> > ~DAC_PALETTE_ACCESS_CNTL);
> > }
> > diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
> > index 72bcfbe..6dda5d8 100644
> > --- a/drivers/video/fbdev/aty/atyfb_base.c
> > +++ b/drivers/video/fbdev/aty/atyfb_base.c
> > @@ -1188,19 +1188,6 @@ static int aty_crtc_to_var(const struct crtc *crtc,
> > (c_sync ? FB_SYNC_COMP_HIGH_ACT : 0);
> >
> > switch (pix_width) {
> > -#if 0
> > - case CRTC_PIX_WIDTH_4BPP:
> > - bpp = 4;
> > - var->red.offset = 0;
> > - var->red.length = 8;
> > - var->green.offset = 0;
> > - var->green.length = 8;
> > - var->blue.offset = 0;
> > - var->blue.length = 8;
> > - var->transp.offset = 0;
> > - var->transp.length = 0;
> > - break;
> > -#endif
> > case CRTC_PIX_WIDTH_8BPP:
> > bpp = 8;
> > var->red.offset = 0;
> > @@ -1466,11 +1453,6 @@ static int atyfb_set_par(struct fb_info *info)
> > var->bits_per_pixel,
> > par->crtc.vxres * var->bits_per_pixel / 8);
> > #endif /* CONFIG_BOOTX_TEXT */
> > -#if 0
> > - /* switch to accelerator mode */
> > - if (!(par->crtc.gen_cntl & CRTC_EXT_DISP_EN))
> > - aty_st_le32(CRTC_GEN_CNTL, par->crtc.gen_cntl | CRTC_EXT_DISP_EN, par);
> > -#endif
> > #ifdef DEBUG
> > {
> > /* dump non shadow CRTC, pll, LCD registers */
> > @@ -2396,17 +2378,6 @@ static int aty_init(struct fb_info *info)
> > par->pll_ops = &aty_pll_ibm514;
> > break;
> > #endif
> > -#if 0 /* dead code */
> > - case CLK_STG1703:
> > - par->pll_ops = &aty_pll_stg1703;
> > - break;
> > - case CLK_CH8398:
> > - par->pll_ops = &aty_pll_ch8398;
> > - break;
> > - case CLK_ATT20C408:
> > - par->pll_ops = &aty_pll_att20c408;
> > - break;
> > -#endif
> > default:
> > PRINTKI("aty_init: CLK type not implemented yet!");
> > par->pll_ops = &aty_pll_unsupported;
> > --
> > 1.9.1
> >

Subject: Re: [PATCH] video/fbdev/aty128fb: Remove dead code


On 8/14/19 2:23 PM, Souptick Joarder wrote:
> On Wed, Aug 7, 2019 at 2:12 PM Souptick Joarder <[email protected]> wrote:
>>
>> On Wed, Jul 31, 2019 at 12:38 AM Souptick Joarder <[email protected]> wrote:
>>>
>>> This is dead code since 3.15. If there is no plan to use it
>>> further, this can be removed forever.
>>
>> Any comment on this patch ?
>
> Any comment on this patch ?
>
>>
>>>
>>> Signed-off-by: Souptick Joarder <[email protected]>
Patch queued for v5.4, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics