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

clang doesn't support nested functions, and there's no compelling reason
that these functions need to have such a restricted scope.

Change-Id: I698f7b19de8f6dff46a717403c1f518446748b18
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Link: https://android.googlesource.com/kernel/msm/+/a7812babae94ac48da09e7e967c0b55d24a77994
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

3 files changed, 28 insertions, 29 deletions

diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index 81ce5813cec4..40fa54a6cc93 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;
 }
 
-int msm_vidc_close(void *instance)
+static void close_helper(struct kref *kref)
 {
-	void close_helper(struct kref *kref)
-	{
-		struct msm_vidc_inst *inst = container_of(kref,
-				struct msm_vidc_inst, 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 bbf5e33a99f7..f1004f73dd51 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(struct msm_vidc_inst *inst)
+static void put_inst_helper(struct kref *kref)
 {
-	void put_inst_helper(struct kref *kref)
-	{
-		struct msm_vidc_inst *inst = container_of(kref,
-				struct msm_vidc_inst, 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 925914bc7a6d..b430eb01824e 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
@@ -54,17 +54,16 @@ fail_read:
 	return 0;
 }
 
-static inline enum imem_type read_imem_type(struct platform_device *pdev)
+static inline bool is_compatible(char *compat)
 {
-	bool is_compatible(char *compat)
-	{
-		return !!of_find_compatible_node(NULL, NULL, compat);
-	}
+	return !!of_find_compatible_node(NULL, NULL, compat);
+}
 
+static inline enum imem_type read_imem_type(struct platform_device *pdev)
+{
 	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(
@@ -518,20 +517,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. */
@@ -571,7 +570,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, NULL);
+			sizeof(*res->load_freq_tbl), cmp_load_freq_table, NULL);
 	return rc;
 }