There is no reason to have a return code for vp_setup() and dc_setup(). So get rid of them.
Signed-off-by: Christian Gmeiner christian.gmeiner@gmail.com --- vgasrc/geodevga.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 17d5a37..61b54d1 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -204,7 +204,7 @@ static u32 framebuffer_size(void) /* Set up the dc (display controller) portion of the geodelx * The dc provides hardware support for VGA graphics. */ -static int dc_setup(void) +static void dc_setup(void) { u32 dc_fb;
@@ -234,8 +234,6 @@ static int dc_setup(void) /* update VBE variables */ SET_VGA(VBE_framebuffer, geode.fb); SET_VGA(VBE_total_memory, fb_size / 1024 / 64); // number of 64K blocks - - return 0; }
/* Setup the vp (video processor) portion of the geodelx @@ -244,7 +242,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;
@@ -271,8 +269,6 @@ int vp_setup(void) geode_memWrite(geode.vp + VP_DCFG, ~0,VP_CRT_EN+VP_HSYNC_EN+VP_VSYNC_EN+VP_DAC_BL_EN+VP_CRT_SKEW); reg = geode_memRead(geode.vp + VP_DCFG); dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg); - - return 0; }
/**************************************************************** @@ -390,8 +386,8 @@ int geodevga_init(void) dprintf(1, "dc addr: 0x%08x\n", geode.dc); dprintf(1, "vp addr: 0x%08x\n", geode.vp);
- ret |= vp_setup(); - ret |= dc_setup(); + vp_setup(); + dc_setup();
- return ret; + return 0; }