diff --git a/src/add-ons/accelerants/et6x00/SetDisplayMode.c b/src/add-ons/accelerants/et6x00/SetDisplayMode.c
index dce04f32c5..4f426c8c98 100644
--- a/src/add-ons/accelerants/et6x00/SetDisplayMode.c
+++ b/src/add-ons/accelerants/et6x00/SetDisplayMode.c
@@ -50,6 +50,8 @@ uint8 bpp;
             case B_RGB15_BIG:
                 bpp = 2;
                 break;
+			default:
+				return B_BAD_VALUE;
         }
         si->fbc.bytes_per_row = target.virtual_width * bpp;
         si->dm = target;
diff --git a/src/add-ons/kernel/drivers/graphics/et6x00/driver.c b/src/add-ons/kernel/drivers/graphics/et6x00/driver.c
index 594134ddc2..65157228f2 100644
--- a/src/add-ons/kernel/drivers/graphics/et6x00/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/et6x00/driver.c
@@ -323,7 +323,7 @@ exit0:
     return handled;
 }
 /*****************************************************************************/
-uint32 et6000GetOnboardMemorySize(uint16 pciConfigSpace,
+static uint32 et6000GetOnboardMemorySize(uint16 pciConfigSpace,
                                   volatile void *memory)
 {
 uint32 memSize = 0;
diff --git a/src/add-ons/kernel/drivers/graphics/et6x00/setmode.c b/src/add-ons/kernel/drivers/graphics/et6x00/setmode.c
index d8647bb5c0..9e666da5e8 100644
--- a/src/add-ons/kernel/drivers/graphics/et6x00/setmode.c
+++ b/src/add-ons/kernel/drivers/graphics/et6x00/setmode.c
@@ -321,7 +321,7 @@ uint8 i;
     }
 }
 /*****************************************************************************/
-uint32 et6000SetGraphicsMode(VIDEO_MODE_INFORMATION *mi,
+static uint32 et6000SetGraphicsMode(VIDEO_MODE_INFORMATION *mi,
                             uint16 pciConfigSpace)
 {
 uint8 m;
@@ -375,6 +375,8 @@ VIDEO_MODE_INFORMATION mi;
             mi.BitsPerPlane = 16;
             mi.NumberGreenBits = 5;
             break;
+		default:
+			return B_BAD_VALUE;
     }
 
     mi.Frequency = (uint16) (mode->timing.pixel_clock * 1000
@@ -404,6 +406,8 @@ uint16 refreshRate;
         case B_RGB15_BIG:
             bpp = 16;
             break;
+		default:
+			return B_BAD_VALUE;
     }
 
     refreshRate = (uint16) (mode->timing.pixel_clock * 1000