disp: msm: replace kzfree with kfree
This change replaces kzfree with kfree as kzfree has been renamed. While moving to the latest 5.10 tip, additional small changes were required to resolve compilation issues: set_dma_ops has moved from dma-mapping to dma-map-ops header. This change includes the new header file required. drm_panel_add returns void, this change removes the expected return value check. drm_prime_pages_to_sg takes an additional parameter. This change passes in the drm_device pointer the function is looking for. Remove an unused variable in sde_crtc vblank function. Change-Id: I47c085c0cb64432873c2e750ae64cbdc2b5340da Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
@@ -367,7 +367,7 @@ static void sde_hdcp_2x_clean(struct sde_hdcp_2x_ctrl *hdcp)
|
||||
list);
|
||||
hdcp2_close_stream(hdcp->hdcp2_ctx,
|
||||
stream_entry->stream_handle);
|
||||
kzfree(stream_entry);
|
||||
kfree(stream_entry);
|
||||
hdcp->stream_count--;
|
||||
}
|
||||
|
||||
@@ -750,7 +750,7 @@ static void sde_hdcp_2x_manage_stream(struct sde_hdcp_2x_ctrl *hdcp)
|
||||
stream_entry->stream_handle);
|
||||
hdcp->stream_count--;
|
||||
list_del(element);
|
||||
kzfree(stream_entry);
|
||||
kfree(stream_entry);
|
||||
query_streams = true;
|
||||
} else if (!stream_entry->stream_handle) {
|
||||
if (hdcp2_open_stream(hdcp->hdcp2_ctx,
|
||||
@@ -801,7 +801,7 @@ static bool sde_hdcp_2x_remove_streams(struct sde_hdcp_2x_ctrl *hdcp,
|
||||
/* Stream wasn't fully initialized so remove it */
|
||||
hdcp->stream_count--;
|
||||
list_del(entry);
|
||||
kzfree(stream_entry);
|
||||
kfree(stream_entry);
|
||||
} else {
|
||||
stream_entry->active = false;
|
||||
}
|
||||
@@ -1099,7 +1099,7 @@ int sde_hdcp_2x_register(struct sde_hdcp_2x_register_data *data)
|
||||
|
||||
return 0;
|
||||
error:
|
||||
kzfree(hdcp);
|
||||
kfree(hdcp);
|
||||
hdcp = NULL;
|
||||
unlock:
|
||||
return rc;
|
||||
@@ -1114,5 +1114,5 @@ void sde_hdcp_2x_deregister(void *data)
|
||||
|
||||
kthread_stop(hdcp->thread);
|
||||
sde_hdcp_2x_disable(data);
|
||||
kzfree(hdcp);
|
||||
kfree(hdcp);
|
||||
}
|
||||
|
Reference in New Issue
Block a user