diff options
-rw-r--r-- | drivers/staging/omap-thermal/omap-bandgap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c index f86c104df951..26d36f361cc2 100644 --- a/drivers/staging/omap-thermal/omap-bandgap.c +++ b/drivers/staging/omap-thermal/omap-bandgap.c | |||
@@ -338,8 +338,8 @@ exit: | |||
338 | /*** Helper functions handling device Alert/Shutdown signals ***/ | 338 | /*** Helper functions handling device Alert/Shutdown signals ***/ |
339 | 339 | ||
340 | /* Talert masks. Call it only if HAS(TALERT) is set */ | 340 | /* Talert masks. Call it only if HAS(TALERT) is set */ |
341 | static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, | 341 | static void omap_bandgap_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, |
342 | u32 t_hot, u32 t_cold) | 342 | u32 t_hot, u32 t_cold) |
343 | { | 343 | { |
344 | struct temp_sensor_registers *tsr; | 344 | struct temp_sensor_registers *tsr; |
345 | u32 temp, reg_val; | 345 | u32 temp, reg_val; |
@@ -360,8 +360,6 @@ static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, | |||
360 | else | 360 | else |
361 | reg_val &= ~tsr->mask_cold_mask; | 361 | reg_val &= ~tsr->mask_cold_mask; |
362 | omap_bandgap_writel(bg_ptr, reg_val, tsr->bgap_mask_ctrl); | 362 | omap_bandgap_writel(bg_ptr, reg_val, tsr->bgap_mask_ctrl); |
363 | |||
364 | return 0; | ||
365 | } | 363 | } |
366 | 364 | ||
367 | /* Talert Thot threshold. Call it only if HAS(TALERT) is set */ | 365 | /* Talert Thot threshold. Call it only if HAS(TALERT) is set */ |
@@ -399,7 +397,9 @@ int temp_sensor_configure_thot(struct omap_bandgap *bg_ptr, int id, int t_hot) | |||
399 | return -EIO; | 397 | return -EIO; |
400 | } | 398 | } |
401 | 399 | ||
402 | return temp_sensor_unmask_interrupts(bg_ptr, id, t_hot, cold); | 400 | omap_bandgap_unmask_interrupts(bg_ptr, id, t_hot, cold); |
401 | |||
402 | return 0; | ||
403 | } | 403 | } |
404 | 404 | ||
405 | /* Talert Tcold threshold. Call it only if HAS(TALERT) is set */ | 405 | /* Talert Tcold threshold. Call it only if HAS(TALERT) is set */ |
@@ -438,7 +438,9 @@ int temp_sensor_configure_tcold(struct omap_bandgap *bg_ptr, int id, | |||
438 | return -EIO; | 438 | return -EIO; |
439 | } | 439 | } |
440 | 440 | ||
441 | return temp_sensor_unmask_interrupts(bg_ptr, id, hot, t_cold); | 441 | omap_bandgap_unmask_interrupts(bg_ptr, id, hot, t_cold); |
442 | |||
443 | return 0; | ||
442 | } | 444 | } |
443 | 445 | ||
444 | #define bandgap_is_valid(b) \ | 446 | #define bandgap_is_valid(b) \ |