Revert "drivers: media: msm: don't use nested functions"

* We'll take the upstream fix

This reverts commit 8cdcd8cc5f3e325b2f050b1ba01584176630ed1e.

Change-Id: I5f31a5e10d9e64bdf19d5c085ef00222ac25641b

3 files changed, 29 insertions, 28 deletions

diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index 40fa54a6cc93..81ce5813cec4 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -1542,16 +1542,16 @@ int msm_vidc_destroy(struct msm_vidc_inst *inst)
 	return 0;
 }
 
-static void close_helper(struct kref *kref)
+int msm_vidc_close(void *instance)
 {
-	struct msm_vidc_inst *inst = container_of(kref,
-			struct msm_vidc_inst, kref);
+	void close_helper(struct kref *kref)
+	{
+		struct msm_vidc_inst *inst = container_of(kref,
+				struct msm_vidc_inst, kref);
 
-	msm_vidc_destroy(inst);
-}
+		msm_vidc_destroy(inst);
+	}
 
-int msm_vidc_close(void *instance)
-{
 	struct msm_vidc_inst *inst = instance;
 	struct buffer_info *bi, *dummy;
 	int rc = 0, i = 0;
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c
index f1004f73dd51..bbf5e33a99f7 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_common.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c
@@ -712,16 +712,16 @@ static void handle_sys_init_done(enum hal_command_response cmd, void *data)
 	return;
 }
 
-static void put_inst_helper(struct kref *kref)
+static void put_inst(struct msm_vidc_inst *inst)
 {
-	struct msm_vidc_inst *inst = container_of(kref, struct msm_vidc_inst,
-			kref);
+	void put_inst_helper(struct kref *kref)
+	{
+		struct msm_vidc_inst *inst = container_of(kref,
+				struct msm_vidc_inst, kref);
 
-	msm_vidc_destroy(inst);
-}
+		msm_vidc_destroy(inst);
+	}
 
-static void put_inst(struct msm_vidc_inst *inst)
-{
 	if (!inst)
 		return;
 
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
index b430eb01824e..925914bc7a6d 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
@@ -54,16 +54,17 @@ fail_read:
 	return 0;
 }
 
-static inline bool is_compatible(char *compat)
-{
-	return !!of_find_compatible_node(NULL, NULL, compat);
-}
-
 static inline enum imem_type read_imem_type(struct platform_device *pdev)
 {
+	bool is_compatible(char *compat)
+	{
+		return !!of_find_compatible_node(NULL, NULL, compat);
+	}
+
 	return is_compatible("qcom,msm-ocmem") ? IMEM_OCMEM :
 		is_compatible("qcom,msm-vmem") ? IMEM_VMEM :
 						IMEM_NONE;
+
 }
 
 static inline void msm_vidc_free_allowed_clocks_table(
@@ -517,20 +518,20 @@ error:
 	return rc;
 }
 
-/* A comparator to compare loads (needed later on) */
-static int cmp_load_freq_table(const void *a, const void *b)
-{
-	/* want to sort in reverse so flip the comparison */
-	return ((struct load_freq_table *)b)->load -
-		((struct load_freq_table *)a)->load;
-}
-
 static int msm_vidc_load_freq_table(struct msm_vidc_platform_resources *res)
 {
 	int rc = 0;
 	int num_elements = 0;
 	struct platform_device *pdev = res->pdev;
 
+	/* A comparator to compare loads (needed later on) */
+	int cmp(const void *a, const void *b)
+	{
+		/* want to sort in reverse so flip the comparison */
+		return ((struct load_freq_table *)b)->load -
+			((struct load_freq_table *)a)->load;
+	}
+
 	if (!of_find_property(pdev->dev.of_node, "qcom,load-freq-tbl", NULL)) {
 		/* qcom,load-freq-tbl is an optional property.  It likely won't
 		 * be present on cores that we can't clock scale on. */
@@ -570,7 +571,7 @@ static int msm_vidc_load_freq_table(struct msm_vidc_platform_resources *res)
 	 * logic to work, just sort it ourselves
 	 */
 	sort(res->load_freq_tbl, res->load_freq_tbl_size,
-			sizeof(*res->load_freq_tbl), cmp_load_freq_table, NULL);
+			sizeof(*res->load_freq_tbl), cmp, NULL);
 	return rc;
 }