There is no reason to have a return value of type int for dc_setup() and vp_setup() as they return nothing else then 0. Also add missing static to vp_setup(). Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- vgasrc/geodevga.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 5c6caf0..c634f79 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -210,7 +210,7 @@ static void dc_unmap(void) * for features not accessible from the VGA registers, * the dc's pci bar can be mapped to a vga memory segment */ -static int dc_setup(void) +static void dc_setup(void) { u32 fb, dc_fb; u16 seg; @@ -237,8 +237,6 @@ static int dc_setup(void)
dc_lock(seg); dc_unmap(); - - return 0; }
/* Setup the vp (video processor) portion of the geodelx @@ -247,7 +245,7 @@ static int dc_setup(void) * The High Mem Access virtual register is used to configure the * pci mmio bar from 16bit friendly io space. */ -int vp_setup(void) +static void vp_setup(void) { u32 reg,vp;
@@ -277,8 +275,6 @@ int vp_setup(void) geode_memWrite(vp+VP_DCFG, ~0,VP_CRT_EN+VP_HSYNC_EN+VP_VSYNC_EN+VP_DAC_BL_EN+VP_CRT_SKEW); reg = geode_memRead(vp+VP_DCFG); dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg); - - return 0; }
static u8 geode_crtc_01[] VAR16 = { @@ -366,8 +362,9 @@ int geodevga_init(void) if (GET_GLOBAL(VgaBDF) < 0) // Device should be at 00:01.1 SET_VGA(VgaBDF, pci_to_bdf(0, 1, 1)); - ret |= vp_setup(); - ret |= dc_setup(); + + vp_setup(); + dc_setup();
return ret; }