Skip to content

Commit

Permalink
staging: omap-thermal: name temp_to_adc_conversion in a better way
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eduardo Valentin authored and Greg Kroah-Hartman committed Mar 15, 2013
1 parent 2577e93 commit e16f072
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/staging/omap-thermal/omap-bandgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ int omap_bandgap_adc_to_mcelsius(struct omap_bandgap *bg_ptr, int id,
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;
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit e16f072

Please sign in to comment.