summaryrefslogtreecommitdiff
path: root/drivers/staging/omap-thermal
diff options
context:
space:
mode:
authorEduardo Valentin <eduardo.valentin@ti.com>2013-03-15 13:00:12 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-15 16:02:11 (GMT)
commite16f072d5d65a8df53ba4693f1334c453bd303aa (patch)
treec88c4e228ad2037b18798c17e51c3180c18ea987 /drivers/staging/omap-thermal
parent2577e937cb8a4cc6967c4af88546c5939c78dbc5 (diff)
downloadlinux-fsl-qoriq-e16f072d5d65a8df53ba4693f1334c453bd303aa.tar.xz
staging: omap-thermal: name temp_to_adc_conversion in a better way
Rename temp_to_adc_conversion to omap_bandgap_mcelsius_to_adc. This name, though longer, describes better the function. This patch also changes this function signature so the function follows the style of this file. Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/omap-thermal')
-rw-r--r--drivers/staging/omap-thermal/omap-bandgap.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c
index 8279cca..d5359e3 100644
--- a/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/drivers/staging/omap-thermal/omap-bandgap.c
@@ -264,8 +264,9 @@ exit:
return ret;
}
-static int temp_to_adc_conversion(long temp, struct omap_bandgap *bg_ptr, int i,
- int *adc)
+static
+int omap_bandgap_mcelsius_to_adc(struct omap_bandgap *bg_ptr, int i, long temp,
+ int *adc)
{
struct temp_sensor_data *ts_data = bg_ptr->conf->sensors[i].ts_data;
const int *conv_table = bg_ptr->conf->conv_table;
@@ -330,7 +331,7 @@ int add_hyst(int adc_val, int hyst_val, struct omap_bandgap *bg_ptr, int i,
temp += hyst_val;
- return temp_to_adc_conversion(temp, bg_ptr, i, sum);
+ return omap_bandgap_mcelsius_to_adc(bg_ptr, i, temp, sum);
}
/* Talert Thot threshold. Call it only if HAS(TALERT) is set */
@@ -493,7 +494,7 @@ int omap_bandgap_write_thot(struct omap_bandgap *bg_ptr, int id, int val)
if (val < ts_data->min_temp + ts_data->hyst_val)
return -EINVAL;
- ret = temp_to_adc_conversion(val, bg_ptr, id, &t_hot);
+ ret = omap_bandgap_mcelsius_to_adc(bg_ptr, id, val, &t_hot);
if (ret < 0)
return ret;
@@ -566,7 +567,7 @@ int omap_bandgap_write_tcold(struct omap_bandgap *bg_ptr, int id, int val)
if (val > ts_data->max_temp + ts_data->hyst_val)
return -EINVAL;
- ret = temp_to_adc_conversion(val, bg_ptr, id, &t_cold);
+ ret = omap_bandgap_mcelsius_to_adc(bg_ptr, id, val, &t_cold);
if (ret < 0)
return ret;