ARM: tegra: dvfs: Rename dvfs cooling device operations
Alex Frid [Tue, 23 Apr 2013 06:30:29 +0000 (23:30 -0700)]
Renamed dvfs cooling device operations to match updated device name
vmin_cdev (for both legacy and cl_dvfs cooling devices).

Change-Id: I24a3ee3d2c2e9cf738395a5d9788345b0e3ab732
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/221922
(cherry picked from commit 4a8b2a04967bb4dd4cdb0c368c8d920d039f3b26)
Reviewed-on: http://git-master/r/223690
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

arch/arm/mach-tegra/dvfs.c
arch/arm/mach-tegra/tegra_cl_dvfs.c

index 5a25d79..96f5419 100644 (file)
@@ -873,7 +873,7 @@ struct tegra_cooling_device *tegra_dvfs_get_core_vmin_cdev(void)
 
 #ifdef CONFIG_THERMAL
 /* Cooling device limits minimum rail voltage at cold temperature in pll mode */
-static int tegra_dvfs_rail_get_cdev_max_state(
+static int tegra_dvfs_rail_get_vmin_cdev_max_state(
        struct thermal_cooling_device *cdev, unsigned long *max_state)
 {
        struct dvfs_rail *rail = (struct dvfs_rail *)cdev->devdata;
@@ -881,7 +881,7 @@ static int tegra_dvfs_rail_get_cdev_max_state(
        return 0;
 }
 
-static int tegra_dvfs_rail_get_cdev_cur_state(
+static int tegra_dvfs_rail_get_vmin_cdev_cur_state(
        struct thermal_cooling_device *cdev, unsigned long *cur_state)
 {
        struct dvfs_rail *rail = (struct dvfs_rail *)cdev->devdata;
@@ -889,7 +889,7 @@ static int tegra_dvfs_rail_get_cdev_cur_state(
        return 0;
 }
 
-static int tegra_dvfs_rail_set_cdev_state(
+static int tegra_dvfs_rail_set_vmin_cdev_state(
        struct thermal_cooling_device *cdev, unsigned long cur_state)
 {
        struct dvfs_rail *rail = (struct dvfs_rail *)cdev->devdata;
@@ -904,9 +904,9 @@ static int tegra_dvfs_rail_set_cdev_state(
 }
 
 static struct thermal_cooling_device_ops tegra_dvfs_rail_cooling_ops = {
-       .get_max_state = tegra_dvfs_rail_get_cdev_max_state,
-       .get_cur_state = tegra_dvfs_rail_get_cdev_cur_state,
-       .set_cur_state = tegra_dvfs_rail_set_cdev_state,
+       .get_max_state = tegra_dvfs_rail_get_vmin_cdev_max_state,
+       .get_cur_state = tegra_dvfs_rail_get_vmin_cdev_cur_state,
+       .set_cur_state = tegra_dvfs_rail_set_vmin_cdev_state,
 };
 
 static void tegra_dvfs_rail_register_vmin_cdev(struct dvfs_rail *rail)
index 5499a64..9886ee6 100644 (file)
@@ -1068,25 +1068,25 @@ void tegra_cl_dvfs_resume(struct tegra_cl_dvfs *cld)
 }
 
 #ifdef CONFIG_THERMAL
-/* cl_dvfs cooling device */
-static int tegra_cl_dvfs_get_cdev_max_state(struct thermal_cooling_device *cdev,
-                                           unsigned long *max_state)
+/* cl_dvfs vmin cooling device */
+static int tegra_cl_dvfs_get_vmin_cdev_max_state(
+       struct thermal_cooling_device *cdev, unsigned long *max_state)
 {
        struct tegra_cl_dvfs *cld = (struct tegra_cl_dvfs *)cdev->devdata;
        *max_state = cld->vmin_cdev->trip_temperatures_num;
        return 0;
 }
 
-static int tegra_cl_dvfs_get_cdev_cur_state(struct thermal_cooling_device *cdev,
-                                           unsigned long *cur_state)
+static int tegra_cl_dvfs_get_vmin_cdev_cur_state(
+       struct thermal_cooling_device *cdev, unsigned long *cur_state)
 {
        struct tegra_cl_dvfs *cld = (struct tegra_cl_dvfs *)cdev->devdata;
        *cur_state = cld->therm_floor_idx;
        return 0;
 }
 
-static int tegra_cl_dvfs_set_cdev_state(struct thermal_cooling_device *cdev,
-                                       unsigned long cur_state)
+static int tegra_cl_dvfs_set_vmin_cdev_state(
+       struct thermal_cooling_device *cdev, unsigned long cur_state)
 {
        unsigned long flags;
        struct tegra_cl_dvfs *cld = (struct tegra_cl_dvfs *)cdev->devdata;
@@ -1106,9 +1106,9 @@ static int tegra_cl_dvfs_set_cdev_state(struct thermal_cooling_device *cdev,
 }
 
 static struct thermal_cooling_device_ops tegra_cl_dvfs_cooling_ops = {
-       .get_max_state = tegra_cl_dvfs_get_cdev_max_state,
-       .get_cur_state = tegra_cl_dvfs_get_cdev_cur_state,
-       .set_cur_state = tegra_cl_dvfs_set_cdev_state,
+       .get_max_state = tegra_cl_dvfs_get_vmin_cdev_max_state,
+       .get_cur_state = tegra_cl_dvfs_get_vmin_cdev_cur_state,
+       .set_cur_state = tegra_cl_dvfs_set_vmin_cdev_state,
 };
 
 static void tegra_cl_dvfs_init_cdev(struct work_struct *work)