--- initial
+++ final
@@ -1,71 +1,71 @@
 enum ia_css_err ia_css_pipe_destroy(struct ia_css_pipe *pipe) {
   enum ia_css_err err = IA_CSS_SUCCESS;
   IA_CSS_ENTER("pipe = %p", pipe);
   if (pipe == NULL) {
     IA_CSS_LEAVE_ERR(IA_CSS_ERR_INVALID_ARGUMENTS);
     return IA_CSS_ERR_INVALID_ARGUMENTS;
   }
   if (pipe->stream != NULL) {
     IA_CSS_LOG("ia_css_stream_destroy not called!");
     IA_CSS_LEAVE_ERR(IA_CSS_ERR_INVALID_ARGUMENTS);
     return IA_CSS_ERR_INVALID_ARGUMENTS;
   }
   switch (pipe->config.mode) {
   case IA_CSS_PIPE_MODE_PREVIEW:
     /* need to take into account that this function is also called
        on the internal copy pipe */
     if (pipe->mode == IA_CSS_PIPE_ID_PREVIEW) {
       ia_css_frame_free_multiple(NUM_CONTINUOUS_FRAMES, pipe->continuous_frames);
       ia_css_metadata_free_multiple(NUM_CONTINUOUS_FRAMES, pipe->cont_md_buffers);
       if (pipe->pipe_settings.preview.copy_pipe) {
         err = ia_css_pipe_destroy(pipe->pipe_settings.preview.copy_pipe);
         ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
                             "ia_css_pipe_destroy(): "
                             "destroyed internal copy pipe err=%d\n",
                             err);
       }
     }
     break;
   case IA_CSS_PIPE_MODE_VIDEO:
     if (pipe->mode == IA_CSS_PIPE_ID_VIDEO) {
       ia_css_frame_free_multiple(NUM_CONTINUOUS_FRAMES, pipe->continuous_frames);
       ia_css_metadata_free_multiple(NUM_CONTINUOUS_FRAMES, pipe->cont_md_buffers);
       if (pipe->pipe_settings.video.copy_pipe) {
         err = ia_css_pipe_destroy(pipe->pipe_settings.video.copy_pipe);
         ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
                             "ia_css_pipe_destroy(): "
                             "destroyed internal copy pipe err=%d\n",
                             err);
       }
     }
 #ifndef ISP2401
     ia_css_frame_free_multiple(NUM_VIDEO_TNR_FRAMES, pipe->pipe_settings.video.tnr_frames);
 #else
     ia_css_frame_free_multiple(NUM_TNR_FRAMES, pipe->pipe_settings.video.tnr_frames);
 #endif
     ia_css_frame_free_multiple(MAX_NUM_VIDEO_DELAY_FRAMES, pipe->pipe_settings.video.delay_frames);
     break;
   case IA_CSS_PIPE_MODE_CAPTURE: ia_css_frame_free_multiple(MAX_NUM_VIDEO_DELAY_FRAMES, pipe->pipe_settings.capture.delay_frames); break;
   case IA_CSS_PIPE_MODE_ACC: sh_css_pipe_free_acc_binaries(pipe); break;
   case IA_CSS_PIPE_MODE_COPY: break;
   case IA_CSS_PIPE_MODE_YUVPP: break;
   }
 #ifndef ISP2401
   if (pipe->scaler_pp_lut != mmgr_NULL) {
-    mmgr_free(pipe->scaler_pp_lut);
+    hmm_free(pipe->scaler_pp_lut);
     pipe->scaler_pp_lut = mmgr_NULL;
   }
 #else
   sh_css_params_free_gdc_lut(pipe->scaler_pp_lut);
   pipe->scaler_pp_lut = mmgr_NULL;
 #endif
   my_css.active_pipes[ia_css_pipe_get_pipe_num(pipe)] = NULL;
   sh_css_pipe_free_shading_table(pipe);
   ia_css_pipeline_destroy(&pipe->pipeline);
   pipe_release_pipe_num(ia_css_pipe_get_pipe_num(pipe));
   /* Temporarily, not every sh_css_pipe has an acc_extension. */
   if (pipe->config.acc_extension) { ia_css_pipe_unload_extension(pipe, pipe->config.acc_extension); }
   kfree(pipe);
   IA_CSS_LEAVE("err = %d", err);
   return err;
 }<sep>@@
expression e;
@@
-       mmgr_free
+       hmm_free
		(e)