Skip to content

Commit

Permalink
viafb: simplify viafb_fill_crtc_timing
Browse files Browse the repository at this point in the history
As the first argument is just part of the structure passed as the
second argument there is no need for it at all.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Florian Tobias Schandinat authored and Florian Tobias Schandinat committed Aug 5, 2011
1 parent 9ee3ec4 commit 92746c3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
6 changes: 2 additions & 4 deletions drivers/video/via/dvi.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,10 @@ void viafb_dvi_set_mode(struct VideoModeTable *mode, int mode_bpp,
if ((maxPixelClock != 0) && (desirePixelClock > maxPixelClock)) {
rb_mode = viafb_get_rb_mode(mode->crtc[0].crtc.hor_addr,
mode->crtc[0].crtc.ver_addr);
if (rb_mode) {
if (rb_mode)
mode = rb_mode;
pDviTiming = rb_mode->crtc;
}
}
viafb_fill_crtc_timing(pDviTiming, mode, mode_bpp / 8, set_iga);
viafb_fill_crtc_timing(mode, mode_bpp / 8, set_iga);
}

/* Sense DVI Connector */
Expand Down
12 changes: 6 additions & 6 deletions drivers/video/via/hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1467,9 +1467,10 @@ void viafb_set_vclock(u32 clk, int set_iga)
via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */
}

void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
struct VideoModeTable *video_mode, int bpp_byte, int set_iga)
void viafb_fill_crtc_timing(struct VideoModeTable *video_mode, int bpp_byte,
int set_iga)
{
struct crt_mode_table *crt_table = video_mode->crtc;
struct display_timing crt_reg;
int i;
int index = 0;
Expand Down Expand Up @@ -1911,11 +1912,10 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp,
if (viafb_CRT_ON) {
if (viafb_SAMM_ON &&
viaparinfo->shared->iga2_devices & VIA_CRT) {
viafb_fill_crtc_timing(crt_timing1, vmode_tbl1,
video_bpp1 / 8, IGA2);
viafb_fill_crtc_timing(vmode_tbl1, video_bpp1 / 8,
IGA2);
} else {
viafb_fill_crtc_timing(crt_timing, vmode_tbl,
video_bpp / 8,
viafb_fill_crtc_timing(vmode_tbl, video_bpp / 8,
(viaparinfo->shared->iga1_devices & VIA_CRT)
? IGA1 : IGA2);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/via/hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,8 @@ extern int viafb_LCD_ON;
extern int viafb_DVI_ON;
extern int viafb_hotplug;

void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
struct VideoModeTable *video_mode, int bpp_byte, int set_iga);
void viafb_fill_crtc_timing(struct VideoModeTable *video_mode, int bpp_byte,
int set_iga);

void viafb_set_vclock(u32 CLK, int set_iga);
void viafb_load_reg(int timing_value, int viafb_load_reg_num,
Expand Down

0 comments on commit 92746c3

Please sign in to comment.