From 262099e94afafc2ef98ca2f8c98c01bffab4d660 Mon Sep 17 00:00:00 2001 From: Samantha Tran Date: Mon, 21 Dec 2020 14:48:29 -0800 Subject: [PATCH] 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 --- msm/dsi/dsi_panel.c | 8 ++------ msm/msm_gem.c | 2 +- msm/msm_gem_prime.c | 2 +- msm/msm_mmu.h | 1 + msm/sde/sde_crtc.c | 1 - msm/sde/sde_hw_cdm.c | 2 +- msm/sde/sde_hw_ctl.c | 2 +- msm/sde/sde_hw_ds.c | 2 +- msm/sde/sde_hw_dsc.c | 2 +- msm/sde/sde_hw_dspp.c | 2 +- msm/sde/sde_hw_intf.c | 2 +- msm/sde/sde_hw_lm.c | 2 +- msm/sde/sde_hw_pingpong.c | 2 +- msm/sde/sde_hw_qdss.c | 2 +- msm/sde/sde_hw_sspp.c | 2 +- msm/sde/sde_hw_top.c | 2 +- msm/sde/sde_hw_wb.c | 2 +- msm/sde_hdcp_2x.c | 10 +++++----- msm/sde_io_util.c | 6 +++--- 19 files changed, 25 insertions(+), 29 deletions(-) diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c index 758be7793a..1c02f98de2 100644 --- a/msm/dsi/dsi_panel.c +++ b/msm/dsi/dsi_panel.c @@ -2176,7 +2176,7 @@ int dsi_panel_get_io_resources(struct dsi_panel *panel, parse_fail: list_for_each_entry_safe(pos, tmp, &temp_head, list) { list_del(&pos->list); - kzfree(pos); + kfree(pos); } end: return rc; @@ -3563,15 +3563,11 @@ struct dsi_panel *dsi_panel_get(struct device *parent, NULL, DRM_MODE_CONNECTOR_DSI); panel->mipi_device.dev.of_node = of_node; - rc = drm_panel_add(&panel->drm_panel); - if (rc) - goto error_vreg_put; + drm_panel_add(&panel->drm_panel); mutex_init(&panel->panel_lock); return panel; -error_vreg_put: - (void)dsi_panel_vreg_put(panel); error: kfree(panel); return ERR_PTR(rc); diff --git a/msm/msm_gem.c b/msm/msm_gem.c index c60547a1a0..648f8044ed 100644 --- a/msm/msm_gem.c +++ b/msm/msm_gem.c @@ -100,7 +100,7 @@ static struct page **get_pages(struct drm_gem_object *obj) msm_obj->pages = p; - msm_obj->sgt = drm_prime_pages_to_sg(p, npages); + msm_obj->sgt = drm_prime_pages_to_sg(dev, p, npages); if (IS_ERR(msm_obj->sgt)) { void *ptr = ERR_CAST(msm_obj->sgt); diff --git a/msm/msm_gem_prime.c b/msm/msm_gem_prime.c index 8ad394e4dc..ddf539941b 100644 --- a/msm/msm_gem_prime.c +++ b/msm/msm_gem_prime.c @@ -35,7 +35,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj) if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */ return NULL; - return drm_prime_pages_to_sg(msm_obj->pages, npages); + return drm_prime_pages_to_sg(obj->dev, msm_obj->pages, npages); } void *msm_gem_prime_vmap(struct drm_gem_object *obj) diff --git a/msm/msm_mmu.h b/msm/msm_mmu.h index 448de50af0..ead4495287 100644 --- a/msm/msm_mmu.h +++ b/msm/msm_mmu.h @@ -20,6 +20,7 @@ #include #include +#include struct msm_mmu; diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index fc1a380cc2..e776fe5cf7 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -6286,7 +6286,6 @@ static void vblank_ctrl_worker(struct kthread_work *work) struct vblank_work *cur_work = container_of(work, struct vblank_work, work); struct msm_drm_private *priv = cur_work->priv; - struct msm_kms *kms = priv->kms; sde_crtc_vblank(priv->crtcs[cur_work->crtc_id], cur_work->enable); diff --git a/msm/sde/sde_hw_cdm.c b/msm/sde/sde_hw_cdm.c index 3344a85cb5..37e05380f2 100644 --- a/msm/sde/sde_hw_cdm.c +++ b/msm/sde/sde_hw_cdm.c @@ -347,7 +347,7 @@ struct sde_hw_cdm *sde_hw_cdm_init(enum sde_cdm idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_ctl.c b/msm/sde/sde_hw_ctl.c index 4558a5d66e..66b4e3fdc4 100644 --- a/msm/sde/sde_hw_ctl.c +++ b/msm/sde/sde_hw_ctl.c @@ -1439,7 +1439,7 @@ struct sde_hw_ctl *sde_hw_ctl_init(enum sde_ctl idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_ds.c b/msm/sde/sde_hw_ds.c index 2e729aa74e..ddbf68b200 100644 --- a/msm/sde/sde_hw_ds.c +++ b/msm/sde/sde_hw_ds.c @@ -131,7 +131,7 @@ struct sde_hw_ds *sde_hw_ds_init(enum sde_ds idx, return hw_ds; blk_init_error: - kzfree(hw_ds); + kfree(hw_ds); return ERR_PTR(rc); diff --git a/msm/sde/sde_hw_dsc.c b/msm/sde/sde_hw_dsc.c index 7f917a1d7d..2cee68a98d 100644 --- a/msm/sde/sde_hw_dsc.c +++ b/msm/sde/sde_hw_dsc.c @@ -300,7 +300,7 @@ struct sde_hw_dsc *sde_hw_dsc_init(enum sde_dsc idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_dspp.c b/msm/sde/sde_hw_dspp.c index 56427afec1..9f533b0fd3 100644 --- a/msm/sde/sde_hw_dspp.c +++ b/msm/sde/sde_hw_dspp.c @@ -453,7 +453,7 @@ struct sde_hw_dspp *sde_hw_dspp_init(enum sde_dspp idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_intf.c b/msm/sde/sde_hw_intf.c index 5c4bc917d6..651a15029e 100644 --- a/msm/sde/sde_hw_intf.c +++ b/msm/sde/sde_hw_intf.c @@ -864,7 +864,7 @@ struct sde_hw_intf *sde_hw_intf_init(enum sde_intf idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_lm.c b/msm/sde/sde_hw_lm.c index 240b4c4938..946fd17ef2 100644 --- a/msm/sde/sde_hw_lm.c +++ b/msm/sde/sde_hw_lm.c @@ -341,7 +341,7 @@ struct sde_hw_mixer *sde_hw_lm_init(enum sde_lm idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_pingpong.c b/msm/sde/sde_hw_pingpong.c index 2df4dd4496..5d4edd7b40 100644 --- a/msm/sde/sde_hw_pingpong.c +++ b/msm/sde/sde_hw_pingpong.c @@ -570,7 +570,7 @@ struct sde_hw_pingpong *sde_hw_pingpong_init(enum sde_pingpong idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_qdss.c b/msm/sde/sde_hw_qdss.c index 054ad76daf..abfad31799 100644 --- a/msm/sde/sde_hw_qdss.c +++ b/msm/sde/sde_hw_qdss.c @@ -82,7 +82,7 @@ struct sde_hw_qdss *sde_hw_qdss_init(enum sde_qdss idx, rc = sde_hw_blk_init(&c->base, SDE_HW_BLK_QDSS, idx, &sde_hw_ops); if (rc) { SDE_ERROR("failed to init hw blk %d\n", rc); - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_sspp.c b/msm/sde/sde_hw_sspp.c index 35c8f5d8d7..f9fcc71780 100644 --- a/msm/sde/sde_hw_sspp.c +++ b/msm/sde/sde_hw_sspp.c @@ -1368,7 +1368,7 @@ struct sde_hw_pipe *sde_hw_sspp_init(enum sde_sspp idx, return hw_pipe; blk_init_error: - kzfree(hw_pipe); + kfree(hw_pipe); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_top.c b/msm/sde/sde_hw_top.c index 975b1c5cab..f866f66a65 100644 --- a/msm/sde/sde_hw_top.c +++ b/msm/sde/sde_hw_top.c @@ -716,7 +716,7 @@ struct sde_hw_mdp *sde_hw_mdptop_init(enum sde_mdp idx, return mdp; blk_init_error: - kzfree(mdp); + kfree(mdp); return ERR_PTR(rc); } diff --git a/msm/sde/sde_hw_wb.c b/msm/sde/sde_hw_wb.c index 72b79e82c9..441fa80c35 100644 --- a/msm/sde/sde_hw_wb.c +++ b/msm/sde/sde_hw_wb.c @@ -365,7 +365,7 @@ struct sde_hw_wb *sde_hw_wb_init(enum sde_wb idx, return c; blk_init_error: - kzfree(c); + kfree(c); return ERR_PTR(rc); } diff --git a/msm/sde_hdcp_2x.c b/msm/sde_hdcp_2x.c index 6eee1e5649..533301e59d 100644 --- a/msm/sde_hdcp_2x.c +++ b/msm/sde_hdcp_2x.c @@ -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); } diff --git a/msm/sde_io_util.c b/msm/sde_io_util.c index 23b8828ae2..3e35499e65 100644 --- a/msm/sde_io_util.c +++ b/msm/sde_io_util.c @@ -175,7 +175,7 @@ int msm_dss_get_pmic_io_mem(struct platform_device *pdev, parse_fail: msm_dss_clean_io_mem(&temp_head); end: - kzfree(res); + kfree(res); return rc; } EXPORT_SYMBOL(msm_dss_get_pmic_io_mem); @@ -260,7 +260,7 @@ void msm_dss_clean_io_mem(struct list_head *mem_list) list_for_each_entry_safe(pos, tmp, mem_list, list) { list_del(&pos->list); - kzfree(pos); + kfree(pos); } } EXPORT_SYMBOL(msm_dss_clean_io_mem); @@ -296,7 +296,7 @@ void msm_dss_clean_io_irq(struct list_head *irq_list) list_for_each_entry_safe(pos, tmp, irq_list, list) { list_del(&pos->list); - kzfree(pos); + kfree(pos); } } EXPORT_SYMBOL(msm_dss_clean_io_irq);