$NetBSD$

--- cpia2_core.c.orig	2006-04-22 17:32:52.000000000 +0000
+++ cpia2_core.c
@@ -560,6 +560,7 @@ int cpia2_do_command(struct camera_data 
                 cam->params.vp_params.user_effects = cmd.buffer.block_data[0];
 		break;
 	default:
+		break;
 	}
 	return retval;
 }
@@ -619,7 +620,7 @@ int cpia2_send_command(struct camera_dat
 			    block_name[block_index]);
 		break;
 	default:
-		LOG(__FUNCTION__": invalid request mode\n");
+		LOG("%s: invalid request mode\n", __FUNCTION__);
 		return -EINVAL;
 	}
 
@@ -1009,7 +1010,7 @@ static int set_default_user_mode(struct 
 			frame_rate = CPIA2_VP_FRAMERATE_30;
 		break;
 	default:
-		LOG(__FUNCTION__": Invalid sensor flag value 0x%0X\n",
+		LOG("%s: Invalid sensor flag value 0x%0X\n", __FUNCTION__,
 		    cam->params.version.sensor_flags);
 		return -EINVAL;
 	}
