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 <[email protected]>

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);

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);
 

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)

msm/msm_mmu.h

@@ -20,6 +20,7 @@
 
 #include <linux/iommu.h>
 #include <linux/dma-mapping.h>
+#include <linux/dma-map-ops.h>
 
 struct msm_mmu;
 

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);
 

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);
 }

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);
 }

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);
 

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 	}
 

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);
 }

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);
 }

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);
 }

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);
 }

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);