Skip to content

Commit

Permalink
staging: omap-thermal: refactor temp_sensor_unmask_interrupts
Browse files Browse the repository at this point in the history
This change improves temp_sensor_unmask_interrupts by:
. renaming it to omap_bandgap_unmask_interrupts
. making it a void function, as there is nothing really to report an error.

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 f8ccce2 commit 9102168
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/staging/omap-thermal/omap-bandgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val,
/*** Helper functions handling device Alert/Shutdown signals ***/

/* Talert masks. Call it only if HAS(TALERT) is set */
static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,
u32 t_hot, u32 t_cold)
static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,
u32 t_hot, u32 t_cold)
{
struct temp_sensor_registers *tsr;
u32 temp, reg_val;
Expand All @@ -360,8 +360,6 @@ static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,
else
reg_val &= ~tsr->mask_cold_mask;
omap_bandgap_writel(bg_ptr, reg_val, tsr->bgap_mask_ctrl);

return 0;
}

/* Talert Thot threshold. Call it only if HAS(TALERT) is set */
Expand Down Expand Up @@ -399,7 +397,9 @@ int temp_sensor_configure_thot(struct omap_bandgap *bg_ptr, int id, int t_hot)
return -EIO;
}

return temp_sensor_unmask_interrupts(bg_ptr, id, t_hot, cold);
omap_bandgap_unmask_interrupts(bg_ptr, id, t_hot, cold);

return 0;
}

/* Talert Tcold threshold. Call it only if HAS(TALERT) is set */
Expand Down Expand Up @@ -438,7 +438,9 @@ int temp_sensor_configure_tcold(struct omap_bandgap *bg_ptr, int id,
return -EIO;
}

return temp_sensor_unmask_interrupts(bg_ptr, id, hot, t_cold);
omap_bandgap_unmask_interrupts(bg_ptr, id, hot, t_cold);

return 0;
}

#define bandgap_is_valid(b) \
Expand Down

0 comments on commit 9102168

Please sign in to comment.