Fixes the following W=1 kernel build warning(s):

drivers/video/of_display_timing.c:58: warning: Function parameter or member 'dt' not described in 'of_parse_display_timing'

Cc: Steffen Trumtrar s.trumtrar@pengutronix.de Cc: Sascha Hauer s.hauer@pengutronix.de Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/of_display_timing.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index abc9ada798ee8..9f21f7dc85292 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -52,6 +52,7 @@ static int parse_timing_property(const struct device_node *np, const char *name, /** * of_parse_display_timing - parse display_timing entry from device_node * @np: device_node with the properties + * @dt: Display timing information **/ static int of_parse_display_timing(const struct device_node *np, struct display_timing *dt)

'dac_type' is only used in the '#ifdef CONFIG_ATARI' clause.

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/aty/atyfb_base.c: In function ‘aty_init’: drivers/video/fbdev/aty/atyfb_base.c:2363:6: warning: variable ‘dac_type’ set but not used [-Wunused-but-set-variable]

Cc: Vaibhav Gupta vaibhavgupta40@gmail.com Cc: Alex Kern alex.kern@gmx.de Cc: "Eddie C. Dost" ecd@skynet.be Cc: Anthony Tong atong@uiuc.edu Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/aty/atyfb_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index 11c328f0585ce..9b056b49f2807 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -2360,7 +2360,7 @@ static int aty_init(struct fb_info *info) #ifdef CONFIG_FB_ATY_GX if (!M64_HAS(INTEGRATED)) { u32 stat0; - u8 dac_type, dac_subtype, clk_type; + u8 __maybe_unused dac_type, dac_subtype, clk_type; stat0 = aty_ld_le32(CNFG_STAT0, par); par->bus_type = (stat0 >> 0) & 0x07; par->ram_type = (stat0 >> 3) & 0x07;

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/core/fb_notify.c:44: warning: Function parameter or member 'val' not described in 'fb_notifier_call_chain' drivers/video/fbdev/core/fb_notify.c:44: warning: Function parameter or member 'v' not described in 'fb_notifier_call_chain'

Cc: Antonino Daplas adaplas@pol.net Cc: Brad Douglas brad@neruo.com Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/core/fb_notify.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/core/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c index 74c2da5288848..1f142182fb40e 100644 --- a/drivers/video/fbdev/core/fb_notify.c +++ b/drivers/video/fbdev/core/fb_notify.c @@ -36,9 +36,8 @@ int fb_unregister_client(struct notifier_block *nb) } EXPORT_SYMBOL(fb_unregister_client);

-/** +/* * fb_notifier_call_chain - notify clients of fb_events - * */ int fb_notifier_call_chain(unsigned long val, void *v) {

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/sis/sis_main.c: In function ‘sisfb_post_xgi_ddr2’: drivers/video/fbdev/sis/sis_main.c:5032:5: warning: variable ‘reg’ set but not used [-Wunused-but-set-variable]

Cc: Thomas Winischhofer thomas@winischhofer.net Cc: Gerd Knorr kraxel@goldbach.in-berlin.de Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/sis/sis_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c index 03c736f6f3d08..266a5582f94d3 100644 --- a/drivers/video/fbdev/sis/sis_main.c +++ b/drivers/video/fbdev/sis/sis_main.c @@ -5029,7 +5029,6 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) static const u8 cs168[8] = { 0x48, 0x78, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00 }; - u8 reg; u8 v1; u8 v2; u8 v3; @@ -5037,9 +5036,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) SiS_SetReg(SISCR, 0xb0, 0x80); /* DDR2 dual frequency mode */ SiS_SetReg(SISCR, 0x82, 0x77); SiS_SetReg(SISCR, 0x86, 0x00); - reg = SiS_GetReg(SISCR, 0x86); + SiS_GetReg(SISCR, 0x86); SiS_SetReg(SISCR, 0x86, 0x88); - reg = SiS_GetReg(SISCR, 0x86); + SiS_GetReg(SISCR, 0x86); v1 = cs168[regb]; v2 = cs160[regb]; v3 = cs158[regb]; if (ivideo->haveXGIROM) { v1 = bios[regb + 0x168]; @@ -5049,9 +5048,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb) SiS_SetReg(SISCR, 0x86, v1); SiS_SetReg(SISCR, 0x82, 0x77); SiS_SetReg(SISCR, 0x85, 0x00); - reg = SiS_GetReg(SISCR, 0x85); + SiS_GetReg(SISCR, 0x85); SiS_SetReg(SISCR, 0x85, 0x88); - reg = SiS_GetReg(SISCR, 0x85); + SiS_GetReg(SISCR, 0x85); SiS_SetReg(SISCR, 0x85, v2); SiS_SetReg(SISCR, 0x82, v3); SiS_SetReg(SISCR, 0x98, 0x01);

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/riva/riva_hw.c: In function ‘nv10CalcArbitration’: drivers/video/fbdev/riva/riva_hw.c:849:9: warning: variable ‘pclks_2_top_fifo’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:848:43: warning: variable ‘vus_pipe’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:848:21: warning: variable ‘us_pipe’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:848:9: warning: variable ‘craw’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:846:27: warning: variable ‘vlwm’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:844:37: warning: variable ‘video_drain_rate’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:841:21: warning: variable ‘us_extra’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:840:55: warning: variable ‘vbs’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:839:25: warning: variable ‘cas’ set but not used [-Wunused-but-set-variable]

Cc: Antonino Daplas adaplas@gmail.com Cc: Jeff Garzik jgarzik@pobox.com Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/riva/riva_hw.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c index bcf9c4b4de311..4ee63f7d84d3e 100644 --- a/drivers/video/fbdev/riva/riva_hw.c +++ b/drivers/video/fbdev/riva/riva_hw.c @@ -836,17 +836,17 @@ static void nv10CalcArbitration nv10_sim_state *arb ) { - int data, pagemiss, cas,width, video_enable, bpp; - int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs; - int nvclk_fill, us_extra; + int data, pagemiss, width, video_enable, bpp; + int nvclks, mclks, pclks, vpagemiss, crtpagemiss; + int nvclk_fill; int found, mclk_extra, mclk_loop, cbs, m1; int mclk_freq, pclk_freq, nvclk_freq, mp_enable; - int us_m, us_m_min, us_n, us_p, video_drain_rate, crtc_drain_rate; + int us_m, us_m_min, us_n, us_p, crtc_drain_rate; int vus_m, vus_n, vus_p; - int vpm_us, us_video, vlwm, cpm_us, us_crt,clwm; + int vpm_us, us_video, cpm_us, us_crt,clwm; int clwm_rnd_down; - int craw, m2us, us_pipe, us_pipe_min, vus_pipe, p1clk, p2; - int pclks_2_top_fifo, min_mclk_extra; + int m2us, us_pipe_min, p1clk, p2; + int min_mclk_extra; int us_min_mclk_extra;

fifo->valid = 1; @@ -854,16 +854,13 @@ static void nv10CalcArbitration mclk_freq = arb->mclk_khz; nvclk_freq = arb->nvclk_khz; pagemiss = arb->mem_page_miss; - cas = arb->mem_latency; width = arb->memory_width/64; video_enable = arb->enable_video; bpp = arb->pix_bpp; mp_enable = arb->enable_mp; clwm = 0; - vlwm = 1024;

cbs = 512; - vbs = 512;

pclks = 4; /* lwm detect. */

@@ -924,17 +921,13 @@ static void nv10CalcArbitration us_min_mclk_extra = min_mclk_extra *1000*1000 / mclk_freq; us_n = nvclks*1000*1000 / nvclk_freq;/* nvclk latency in us */ us_p = pclks*1000*1000 / pclk_freq;/* nvclk latency in us */ - us_pipe = us_m + us_n + us_p; us_pipe_min = us_m_min + us_n + us_p; - us_extra = 0;

vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */ vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */ vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */ - vus_pipe = vus_m + vus_n + vus_p;

if(video_enable) { - video_drain_rate = pclk_freq * 4; /* MB/s */ crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */

vpagemiss = 1; /* self generating page miss */ @@ -993,7 +986,6 @@ static void nv10CalcArbitration else if(crtc_drain_rate * 100 >= nvclk_fill * 98) { clwm = 1024; cbs = 512; - us_extra = (cbs * 1000 * 1000)/ (8*width)/mclk_freq ; } } } @@ -1010,7 +1002,6 @@ static void nv10CalcArbitration

m1 = clwm + cbs - 1024; /* Amount of overfill */ m2us = us_pipe_min + us_min_mclk_extra; - pclks_2_top_fifo = (1024-clwm)/(8*width);

/* pclk cycles to drain */ p1clk = m2us * pclk_freq/(1000*1000); @@ -1038,14 +1029,13 @@ static void nv10CalcArbitration min_mclk_extra--; } } - craw = clwm;

if(clwm < (1024-cbs+8)) clwm = 1024-cbs+8; data = (int)(clwm); /* printf("CRT LWM: %f bytes, prog: 0x%x, bs: 256\n", clwm, data ); */ fifo->graphics_lwm = data; fifo->graphics_burst_size = cbs;

- /* printf("VID LWM: %f bytes, prog: 0x%x, bs: %d\n, ", vlwm, data, vbs ); */ + /* printf("VID LWM: 1024 bytes, prog: 0x%x, bs: 512\n, ", data); */ fifo->video_lwm = 1024; fifo->video_burst_size = 512; } }

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/sis/oem310.h:213:28: warning: ‘SiS_TVDelay661_301B’ defined but not used [-Wunused-const-variable=] drivers/video/fbdev/sis/oem310.h:203:28: warning: ‘SiS_TVDelay661_301’ defined but not used [-Wunused-const-variable=]

Cc: Thomas Winischhofer thomas@winischhofer.net Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/sis/oem310.h | 20 -------------------- 1 file changed, 20 deletions(-)

diff --git a/drivers/video/fbdev/sis/oem310.h b/drivers/video/fbdev/sis/oem310.h index 8fce56e4482c0..5f7b503ed2a06 100644 --- a/drivers/video/fbdev/sis/oem310.h +++ b/drivers/video/fbdev/sis/oem310.h @@ -200,26 +200,6 @@ static const unsigned char SiS310_TVDelayCompensation_651302LV[] = /* M650, 651, 0x33,0x33 };

-static const unsigned char SiS_TVDelay661_301[] = /* 661, 301 */ -{ - 0x44,0x44, - 0x44,0x44, - 0x00,0x00, - 0x44,0x44, - 0x44,0x44, - 0x44,0x44 -}; - -static const unsigned char SiS_TVDelay661_301B[] = /* 661, 301B et al */ -{ - 0x44,0x44, - 0x44,0x44, - 0x00,0x00, - 0x44,0x44, - 0x44,0x44, - 0x44,0x44 -}; - static const unsigned char SiS310_TVDelayCompensation_LVDS[] = /* LVDS */ { 0x0a,0x0a,

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/aty/mach64_ct.c: In function ‘aty_init_pll_ct’: drivers/video/fbdev/aty/mach64_ct.c:405:46: warning: variable ‘vga_dsp_on_off’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/aty/mach64_ct.c:405:30: warning: variable ‘vga_dsp_config’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/aty/mach64_ct.c:405:18: warning: variable ‘dsp_on_off’ set but not used [-Wunused-but-set-variable]

Cc: daniel.mantione@freepascal.org Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/aty/mach64_ct.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c index f87cc81f4fa2b..23eececa1e9d7 100644 --- a/drivers/video/fbdev/aty/mach64_ct.c +++ b/drivers/video/fbdev/aty/mach64_ct.c @@ -402,7 +402,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; u8 mpost_div, xpost_div, sclk_post_div_real; u32 q, memcntl, trp; - u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off; + u32 dsp_config; #ifdef DEBUG int pllmclk, pllsclk; #endif @@ -488,25 +488,10 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)

/* Allow BIOS to override */ dsp_config = aty_ld_le32(DSP_CONFIG, par); - dsp_on_off = aty_ld_le32(DSP_ON_OFF, par); - vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par); - vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par);

if (dsp_config) pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16; -#if 0 - FIXME: is it relevant for us? - if ((!dsp_on_off && !M64_HAS(RESET_3D)) || - ((dsp_on_off == vga_dsp_on_off) && - (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))) { - vga_dsp_on_off &= VGA_DSP_OFF; - vga_dsp_config &= VGA_DSP_XCLKS_PER_QW; - if (ATIDivide(vga_dsp_on_off, vga_dsp_config, 5, 1) > 24) - pll->ct.fifo_size = 32; - else - pll->ct.fifo_size = 24; - } -#endif + /* Exit if the user does not want us to tamper with the clock rates of her chip. */ if (par->mclk_per == 0) {

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/pm2fb.c:1515: warning: Function parameter or member 'pdev' not described in 'pm2fb_probe' drivers/video/fbdev/pm2fb.c:1515: warning: Function parameter or member 'id' not described in 'pm2fb_probe' drivers/video/fbdev/pm2fb.c:1721: warning: Function parameter or member 'pdev' not described in 'pm2fb_remove' drivers/video/fbdev/pm2fb.c:1765: warning: Function parameter or member 'options' not described in 'pm2fb_setup'

Cc: "Gustavo A. R. Silva" gustavoars@kernel.org Cc: Jim Hague jim.hague@acm.org Cc: Ilario Nardinocchi nardinoc@CS.UniBO.IT Cc: Jakub Jelinek jakub@redhat.com Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/pm2fb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c index 27893fa139b08..6a30096676374 100644 --- a/drivers/video/fbdev/pm2fb.c +++ b/drivers/video/fbdev/pm2fb.c @@ -1504,12 +1504,12 @@ static const struct fb_ops pm2fb_ops = {

/** - * Device initialisation + * pm2fb_probe - Device initialisation * * Initialise and allocate resource for PCI device. * - * @param pdev PCI device. - * @param id PCI device ID. + * @pdev: PCI device. + * @id: PCI device ID. */ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -1711,11 +1711,11 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) }

/** - * Device removal. + * pm2fb_remove - Device removal. * * Release all device resources. * - * @param pdev PCI device to clean up. + * @pdev: PCI device to clean up. */ static void pm2fb_remove(struct pci_dev *pdev) { @@ -1756,7 +1756,7 @@ MODULE_DEVICE_TABLE(pci, pm2fb_id_table);

#ifndef MODULE -/** +/* * Parse user specified options. * * This is, comma-separated options following `video=pm2fb:'.

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/neofb.c: In function ‘neo_init_hw’: drivers/video/fbdev/neofb.c:1846:6: warning: variable ‘CursorMem’ set but not used [-Wunused-but-set-variable]

Cc: Evgeny Novikov novikov@ispras.ru Cc: Mike Rapoport rppt@kernel.org Cc: Oliver Kropp dok@directfb.org Cc: "Thomas J. Moore" dark@mama.indstate.edu Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/neofb.c | 5 ----- 1 file changed, 5 deletions(-)

diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c index 09a20d4ab35f2..bec199a34037e 100644 --- a/drivers/video/fbdev/neofb.c +++ b/drivers/video/fbdev/neofb.c @@ -1843,7 +1843,6 @@ static int neo_init_hw(struct fb_info *info) struct neofb_par *par = info->par; int videoRam = 896; int maxClock = 65000; - int CursorMem = 1024; int CursorOff = 0x100;

DBG("neo_init_hw"); @@ -1895,26 +1894,22 @@ static int neo_init_hw(struct fb_info *info) case FB_ACCEL_NEOMAGIC_NM2070: case FB_ACCEL_NEOMAGIC_NM2090: case FB_ACCEL_NEOMAGIC_NM2093: - CursorMem = 2048; CursorOff = 0x100; break; case FB_ACCEL_NEOMAGIC_NM2097: case FB_ACCEL_NEOMAGIC_NM2160: - CursorMem = 1024; CursorOff = 0x100; break; case FB_ACCEL_NEOMAGIC_NM2200: case FB_ACCEL_NEOMAGIC_NM2230: case FB_ACCEL_NEOMAGIC_NM2360: case FB_ACCEL_NEOMAGIC_NM2380: - CursorMem = 1024; CursorOff = 0x1000;

par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase; break; } /* - info->sprite.size = CursorMem; info->sprite.scan_align = 1; info->sprite.buf_align = 1; info->sprite.flags = FB_PIXMAP_IO;

'pending' is only used if FBCONDEBUG is defined.

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/core/fbcon.c: In function ‘fbcon_exit’: drivers/video/fbdev/core/fbcon.c:3295:7: warning: variable ‘pending’ set but not used [-Wunused-but-set-variable]

Cc: carter@compsci.bristol.ac.uk Cc: William Rucklidge wjr@cs.cornell.edu Cc: Jes Sorensen jds@kom.auc.dk Cc: Emmanuel Marty core@ggi-project.org Cc: Jakub Jelinek jj@ultra.linux.cz Cc: Martin Mares mj@ucw.cz Cc: Brad Douglas brad@neruo.com Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index bf61598bf1c39..f3d628fd07dc1 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -3292,7 +3292,7 @@ static void fbcon_exit(void) #endif

for_each_registered_fb(i) { - int pending = 0; + int __maybe_unused pending = 0;

mapped = 0; info = registered_fb[i];

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/cirrusfb.c: In function ‘WHDR’: drivers/video/fbdev/cirrusfb.c:2466:16: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]

Cc: Jeff Garzik jgarzik@pobox.com Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/cirrusfb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c index e9027172c0f55..f05160fa34da9 100644 --- a/drivers/video/fbdev/cirrusfb.c +++ b/drivers/video/fbdev/cirrusfb.c @@ -2463,8 +2463,6 @@ static void AttrOn(const struct cirrusfb_info *cinfo) */ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val) { - unsigned char dummy; - if (is_laguna(cinfo)) return; if (cinfo->btype == BT_PICASSO) { @@ -2473,18 +2471,18 @@ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val) WGen(cinfo, VGA_PEL_MSK, 0x00); udelay(200); /* next read dummy from pixel address (3c8) */ - dummy = RGen(cinfo, VGA_PEL_IW); + RGen(cinfo, VGA_PEL_IW); udelay(200); } /* now do the usual stuff to access the HDR */

- dummy = RGen(cinfo, VGA_PEL_MSK); + RGen(cinfo, VGA_PEL_MSK); udelay(200); - dummy = RGen(cinfo, VGA_PEL_MSK); + RGen(cinfo, VGA_PEL_MSK); udelay(200); - dummy = RGen(cinfo, VGA_PEL_MSK); + RGen(cinfo, VGA_PEL_MSK); udelay(200); - dummy = RGen(cinfo, VGA_PEL_MSK); + RGen(cinfo, VGA_PEL_MSK); udelay(200);

WGen(cinfo, VGA_PEL_MSK, val); @@ -2492,7 +2490,7 @@ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val)

if (cinfo->btype == BT_PICASSO) { /* now first reset HDR access counter */ - dummy = RGen(cinfo, VGA_PEL_IW); + RGen(cinfo, VGA_PEL_IW); udelay(200);

/* and at the end, restore the mask value */

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/s3c-fb.c:104: warning: Function parameter or member 'osd_stride' not described in 's3c_fb_variant' drivers/video/fbdev/s3c-fb.c:174: warning: Function parameter or member 'variant' not described in 's3c_fb_win' drivers/video/fbdev/s3c-fb.c:345: warning: Function parameter or member 'pixclk' not described in 's3c_fb_calc_pixclk' drivers/video/fbdev/s3c-fb.c:345: warning: Excess function parameter 'pixclock' description in 's3c_fb_calc_pixclk' drivers/video/fbdev/s3c-fb.c:742: warning: Function parameter or member 'transp' not described in 's3c_fb_setcolreg' drivers/video/fbdev/s3c-fb.c:742: warning: Excess function parameter 'trans' description in 's3c_fb_setcolreg' drivers/video/fbdev/s3c-fb.c:1142: warning: Function parameter or member 'sfb' not described in 's3c_fb_release_win' drivers/video/fbdev/s3c-fb.c:1172: warning: Function parameter or member 'win_no' not described in 's3c_fb_probe_win'

Cc: Jingoo Han jingoohan1@gmail.com Cc: Ben Dooks ben@simtec.co.uk Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/s3c-fb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c index ba316bd56efd7..d33d7df77a6a5 100644 --- a/drivers/video/fbdev/s3c-fb.c +++ b/drivers/video/fbdev/s3c-fb.c @@ -75,6 +75,7 @@ struct s3c_fb; * @buf_size: Offset of buffer size registers. * @buf_end: Offset of buffer end registers. * @osd: The base for the OSD registers. + * @osd_stride: The OSD stride value. * @palette: Address of palette memory, or 0 if none. * @has_prtcon: Set if has PRTCON register. * @has_shadowcon: Set if has SHADOWCON register. @@ -155,7 +156,7 @@ struct s3c_fb_palette { * @windata: The platform data supplied for the window configuration. * @parent: The hardware that this window is part of. * @fbinfo: Pointer pack to the framebuffer info for this window. - * @varint: The variant information for this window. + * @variant: The variant information for this window. * @palette_buffer: Buffer/cache to hold palette entries. * @pseudo_palette: For use in TRUECOLOUR modes for entries 0..15/ * @index: The window number of this window. @@ -336,7 +337,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var, /** * s3c_fb_calc_pixclk() - calculate the divider to create the pixel clock. * @sfb: The hardware state. - * @pixclock: The pixel clock wanted, in picoseconds. + * @pixclk: The pixel clock wanted, in picoseconds. * * Given the specified pixel clock, work out the necessary divider to get * close to the output frequency. @@ -733,7 +734,7 @@ static inline unsigned int chan_to_field(unsigned int chan, * @red: The red field for the palette data. * @green: The green field for the palette data. * @blue: The blue field for the palette data. - * @trans: The transparency (alpha) field for the palette data. + * @transp: The transparency (alpha) field for the palette data. * @info: The framebuffer being changed. */ static int s3c_fb_setcolreg(unsigned regno, @@ -1133,6 +1134,7 @@ static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)

/** * s3c_fb_release_win() - release resources for a framebuffer window. + * @sfb: The base resources for the hardware. * @win: The window to cleanup the resources for. * * Release the resources that where claimed for the hardware window, @@ -1160,6 +1162,7 @@ static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win) /** * s3c_fb_probe_win() - register an hardware window * @sfb: The base resources for the hardware + * @win_no: The ID of the window to be registered * @variant: The variant information for this window. * @res: Pointer to where to place the resultant window. *

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/mx3fb.c: In function ‘sdc_disable_channel’: drivers/video/fbdev/mx3fb.c:448:11: warning: variable ‘enabled’ set but not used [-Wunused-but-set-variable]

Cc: Sam Ravnborg sam@ravnborg.org Cc: Arnd Bergmann arnd@arndb.de Cc: Software Engineering lg@denx.de Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/mx3fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c index 894617ddabcb6..d1c8f7a969ac3 100644 --- a/drivers/video/fbdev/mx3fb.c +++ b/drivers/video/fbdev/mx3fb.c @@ -445,7 +445,6 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi) static void sdc_disable_channel(struct mx3fb_info *mx3_fbi) { struct mx3fb_data *mx3fb = mx3_fbi->mx3fb; - uint32_t enabled; unsigned long flags;

if (mx3_fbi->txd == NULL) @@ -453,7 +452,7 @@ static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)

spin_lock_irqsave(&mx3fb->lock, flags);

- enabled = sdc_fb_uninit(mx3_fbi); + sdc_fb_uninit(mx3_fbi);

spin_unlock_irqrestore(&mx3fb->lock, flags);

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/sis/init.c: In function ‘SiS_Generic_ConvertCRData’: drivers/video/fbdev/sis/init.c:3543:37: warning: variable ‘cr_data2’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/sis/init.c:3542:39: warning: variable ‘VT’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/sis/init.c:3541:39: warning: variable ‘HT’ set but not used [-Wunused-but-set-variable]

Cc: Thomas Winischhofer thomas@winischhofer.net Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/sis/init.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c index 4510272ad297a..b77ea1a8825a5 100644 --- a/drivers/video/fbdev/sis/init.c +++ b/drivers/video/fbdev/sis/init.c @@ -3538,16 +3538,13 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, struct fb_var_screeninfo *var, bool writeres ) { - unsigned short HRE, HBE, HRS, HDE, HT; - unsigned short VRE, VBE, VRS, VDE, VT; - unsigned char sr_data, cr_data, cr_data2; + unsigned short HRE, HBE, HRS, HDE; + unsigned short VRE, VBE, VRS, VDE; + unsigned char sr_data, cr_data; int B, C, D, E, F, temp;

sr_data = crdata[14];

- /* Horizontal total */ - HT = crdata[0] | ((unsigned short)(sr_data & 0x03) << 8); - /* Horizontal display enable end */ HDE = crdata[1] | ((unsigned short)(sr_data & 0x0C) << 6); E = HDE + 1; @@ -3584,12 +3581,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, sr_data = crdata[13]; cr_data = crdata[7];

- /* Vertical total */ - VT = crdata[6] | - ((unsigned short)(cr_data & 0x01) << 8) | - ((unsigned short)(cr_data & 0x20) << 4) | - ((unsigned short)(sr_data & 0x01) << 10); - /* Vertical display enable end */ VDE = crdata[10] | ((unsigned short)(cr_data & 0x02) << 7) | @@ -3604,8 +3595,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, ((unsigned short)(sr_data & 0x08) << 7); F = VRS + 1 - E;

- cr_data2 = (crdata[16] & 0x01) << 5; - /* Vertical blank end */ VBE = crdata[12] | ((unsigned short)(sr_data & 0x10) << 4); temp = VBE - ((E - 1) & 511);

Fixes the following W=1 kernel build warning(s):

drivers/video/fbdev/s1d13xxxfb.c:515: warning: Cannot understand *

Cc: Kristoffer Ericson kristoffer.ericson@gmail.com Cc: Thibaut VARENE varenet@parisc-linux.org Cc: Ben Dooks ben@simtec.co.uk Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Lee Jones lee.jones@linaro.org --- drivers/video/fbdev/s1d13xxxfb.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c index e6e8bc74412c6..b21627c07f8d0 100644 --- a/drivers/video/fbdev/s1d13xxxfb.c +++ b/drivers/video/fbdev/s1d13xxxfb.c @@ -512,7 +512,6 @@ s1d13xxxfb_bitblt_copyarea(struct fb_info *info, const struct fb_copyarea *area) }

/** - * * s1d13xxxfb_bitblt_solidfill - accelerated solidfill function * @info : framebuffer structure * @rect : fb_fillrect structure