Merge "msm: camera: utils: Remove deprecated clk_set_flag functions" into camera-kernel.lnx.1.0

drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_soc.c

@@ -71,39 +71,6 @@ static int cam_fd_hw_soc_util_setup_regbase_indices(
 	return 0;
 }
 
-static int cam_fd_soc_set_clk_flags(struct cam_hw_soc_info *soc_info)
-{
-	int i, rc = 0;
-
-	if (soc_info->num_clk > CAM_SOC_MAX_CLK) {
-		CAM_ERR(CAM_FD, "Invalid num clk %d", soc_info->num_clk);
-		return -EINVAL;
-	}
-
-	/* set memcore and mem periphery logic flags to 0 */
-	for (i = 0; i < soc_info->num_clk; i++) {
-		if ((strcmp(soc_info->clk_name[i], "fd_core_clk") == 0) ||
-			(strcmp(soc_info->clk_name[i], "fd_core_uar_clk") ==
-			0)) {
-			rc = cam_soc_util_set_clk_flags(soc_info, i,
-				CLKFLAG_NORETAIN_MEM);
-			if (rc)
-				CAM_ERR(CAM_FD,
-					"Failed in NORETAIN_MEM i=%d, rc=%d",
-					i, rc);
-
-			cam_soc_util_set_clk_flags(soc_info, i,
-				CLKFLAG_NORETAIN_PERIPH);
-			if (rc)
-				CAM_ERR(CAM_FD,
-					"Failed in NORETAIN_PERIPH i=%d, rc=%d",
-					i, rc);
-		}
-	}
-
-	return rc;
-}
-
 void cam_fd_soc_register_write(struct cam_hw_soc_info *soc_info,
 	enum cam_fd_reg_base reg_base, uint32_t reg_offset, uint32_t reg_value)
 {
@@ -228,12 +195,6 @@ int cam_fd_soc_init_resources(struct cam_hw_soc_info *soc_info,
 		return rc;
 	}
 
-	rc = cam_fd_soc_set_clk_flags(soc_info);
-	if (rc) {
-		CAM_ERR(CAM_FD, "failed in set_clk_flags rc=%d", rc);
-		goto release_res;
-	}
-
 	soc_private = kzalloc(sizeof(struct cam_fd_soc_private), GFP_KERNEL);
 	if (!soc_private) {
 		rc = -ENOMEM;

drivers/cam_utils/cam_soc_util.c

@@ -368,18 +368,6 @@ long cam_soc_util_get_clk_round_rate(struct cam_hw_soc_info *soc_info,
 	return clk_round_rate(soc_info->clk[clk_index], clk_rate);
 }
 
-int cam_soc_util_set_clk_flags(struct cam_hw_soc_info *soc_info,
-	uint32_t clk_index, unsigned long flags)
-{
-	if (!soc_info || (clk_index >= soc_info->num_clk)) {
-		CAM_ERR(CAM_UTIL, "Invalid input params %pK, %d",
-			soc_info, clk_index);
-		return -EINVAL;
-	}
-
-	return clk_set_flags(soc_info->clk[clk_index], flags);
-}
-
 /**
  * cam_soc_util_set_clk_rate()
  *

drivers/cam_utils/cam_soc_util.h

@@ -371,20 +371,6 @@ int cam_soc_util_disable_platform_resource(struct cam_hw_soc_info *soc_info,
 long cam_soc_util_get_clk_round_rate(struct cam_hw_soc_info *soc_info,
 	uint32_t clk_index, unsigned long clk_rate);
 
-/**
- * cam_soc_util_set_clk_flags()
- *
- * @brief:              Camera SOC util to set the flags for a specified clock
- *
- * @soc_info:           Device soc information
- * @clk_index:          Clock index in soc_info for which flags are to be set
- * @flags:              Flags to set
- *
- * @return:             Success or Failure
- */
-int cam_soc_util_set_clk_flags(struct cam_hw_soc_info *soc_info,
-	 uint32_t clk_index, unsigned long flags);
-
 /**
  * cam_soc_util_set_src_clk_rate()
  *