summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUjwal Patel <ujwalp@codeaurora.org>2014-04-01 14:21:46 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:28:52 -0700
commit79fbd868ef7c618a78de6985396bf752f15958d4 (patch)
tree7f1643e52427f7b5b364d57fec15977d580f4253
parent24da978049d98c894625fbb7ad9f503a2d48234b (diff)
msm: mdss: replace kmalloc with kzalloc wherever appropriate
Currently different drivers within MDSS, allocate dynamic memory using kmalloc and then use explicit memset to zero out the content. Instead use kzalloc API to achieve the same. Change-Id: I09d3d5e5986206f90c97d4d04fc3a855c233a7ae Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/dsi_v2.c2
-rw-r--r--drivers/video/fbdev/msm/mdp3_ctrl.c3
-rw-r--r--drivers/video/fbdev/msm/mdp3_ppp.c2
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_overlay.c3
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c7
5 files changed, 6 insertions, 11 deletions
diff --git a/drivers/video/fbdev/msm/dsi_v2.c b/drivers/video/fbdev/msm/dsi_v2.c
index ae35042a1e08..ea410ad6605f 100644
--- a/drivers/video/fbdev/msm/dsi_v2.c
+++ b/drivers/video/fbdev/msm/dsi_v2.c
@@ -540,7 +540,7 @@ void dsi_register_interface(struct dsi_interface *intf)
int dsi_buf_alloc(struct dsi_buf *dp, int size)
{
- dp->start = kmalloc(size, GFP_KERNEL);
+ dp->start = kzalloc(size, GFP_KERNEL);
if (dp->start == NULL) {
pr_err("%s:%u\n", __func__, __LINE__);
return -ENOMEM;
diff --git a/drivers/video/fbdev/msm/mdp3_ctrl.c b/drivers/video/fbdev/msm/mdp3_ctrl.c
index 99e760c663d0..f1e30d56905b 100644
--- a/drivers/video/fbdev/msm/mdp3_ctrl.c
+++ b/drivers/video/fbdev/msm/mdp3_ctrl.c
@@ -1822,12 +1822,11 @@ int mdp3_ctrl_init(struct msm_fb_data_type *mfd)
mdp3_interface->kickoff_fnc = mdp3_ctrl_display_commit_kickoff;
mdp3_interface->lut_update = mdp3_ctrl_lut_update;
- mdp3_session = kmalloc(sizeof(struct mdp3_session_data), GFP_KERNEL);
+ mdp3_session = kzalloc(sizeof(struct mdp3_session_data), GFP_KERNEL);
if (!mdp3_session) {
pr_err("fail to allocate mdp3 private data structure");
return -ENOMEM;
}
- memset(mdp3_session, 0, sizeof(struct mdp3_session_data));
mutex_init(&mdp3_session->lock);
INIT_WORK(&mdp3_session->clk_off_work, mdp3_dispatch_clk_off);
INIT_WORK(&mdp3_session->dma_done_work, mdp3_dispatch_dma_done);
diff --git a/drivers/video/fbdev/msm/mdp3_ppp.c b/drivers/video/fbdev/msm/mdp3_ppp.c
index 449f2bdf3466..5d8f7b6981df 100644
--- a/drivers/video/fbdev/msm/mdp3_ppp.c
+++ b/drivers/video/fbdev/msm/mdp3_ppp.c
@@ -1217,7 +1217,7 @@ int mdp3_ppp_res_init(struct msm_fb_data_type *mfd)
const char timeline_name[] = "mdp3_ppp";
ppp_stat = kzalloc(sizeof(struct ppp_status), GFP_KERNEL);
if (!ppp_stat) {
- pr_err("%s: kmalloc failed\n", __func__);
+ pr_err("%s: kzalloc failed\n", __func__);
return -ENOMEM;
}
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index c1dae92af0e3..12e6c5c9c372 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -3478,12 +3478,11 @@ int mdss_mdp_overlay_init(struct msm_fb_data_type *mfd)
mdp5_interface->get_sync_fnc = mdss_mdp_rotator_sync_pt_get;
mdp5_interface->splash_fnc = mdss_mdp_overlay_splash_image;
- mdp5_data = kmalloc(sizeof(struct mdss_overlay_private), GFP_KERNEL);
+ mdp5_data = kzalloc(sizeof(struct mdss_overlay_private), GFP_KERNEL);
if (!mdp5_data) {
pr_err("fail to allocate mdp5 private data structure");
return -ENOMEM;
}
- memset(mdp5_data, 0, sizeof(struct mdss_overlay_private));
INIT_LIST_HEAD(&mdp5_data->pipes_used);
INIT_LIST_HEAD(&mdp5_data->pipes_cleanup);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 7f21f8ccd6f7..fdbfe7746cec 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -3694,13 +3694,12 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
goto hist_collect_exit;
}
if (hist_cnt > 1) {
- hist_concat = kmalloc(HIST_V_SIZE * sizeof(u32),
+ hist_concat = kzalloc(HIST_V_SIZE * sizeof(u32),
GFP_KERNEL);
if (!hist_concat) {
ret = -ENOMEM;
goto hist_collect_exit;
}
- memset(hist_concat, 0, HIST_V_SIZE * sizeof(u32));
for (i = 0; i < hist_cnt; i++) {
mutex_lock(&hists[i]->hist_mutex);
for (j = 0; j < HIST_V_SIZE; j++)
@@ -3806,15 +3805,13 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
goto hist_collect_exit;
}
if (pipe_cnt > 1) {
- hist_concat = kmalloc(HIST_V_SIZE * pipe_cnt *
+ hist_concat = kzalloc(HIST_V_SIZE * pipe_cnt *
sizeof(u32), GFP_KERNEL);
if (!hist_concat) {
ret = -ENOMEM;
goto hist_collect_exit;
}
- memset(hist_concat, 0, pipe_cnt * HIST_V_SIZE *
- sizeof(u32));
for (i = pipe_num; i < MDSS_PP_ARG_NUM; i++) {
if (!PP_ARG(i, hist->block))
continue;