Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367526
b: refs/heads/master
c: 6f78096
h: refs/heads/master
v: v3
  • Loading branch information
Hongbo Zhang authored and Anton Vorontsov committed Apr 17, 2013
1 parent c1e7b8c commit e9d45e7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a92d4c7d02d0af85b0edbf1d3c12b9e09bf1846d
refs/heads/master: 6f780965aaf3354a3a6165d9018393a4a381b81d
5 changes: 4 additions & 1 deletion trunk/drivers/power/ab8500_btemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ struct ab8500_btemp *ab8500_btemp_get(void)

return btemp;
}
EXPORT_SYMBOL(ab8500_btemp_get);

/**
* ab8500_btemp_batctrl_volt_to_res() - convert batctrl voltage to resistance
Expand Down Expand Up @@ -815,7 +816,7 @@ static void ab8500_btemp_periodic(struct ab8500_btemp *di,
*
* Returns battery temperature
*/
static int ab8500_btemp_get_temp(struct ab8500_btemp *di)
int ab8500_btemp_get_temp(struct ab8500_btemp *di)
{
int temp = 0;

Expand Down Expand Up @@ -851,6 +852,7 @@ static int ab8500_btemp_get_temp(struct ab8500_btemp *di)
}
return temp;
}
EXPORT_SYMBOL(ab8500_btemp_get_temp);

/**
* ab8500_btemp_get_batctrl_temp() - get the temperature
Expand All @@ -862,6 +864,7 @@ int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp)
{
return btemp->bat_temp * 1000;
}
EXPORT_SYMBOL(ab8500_btemp_get_batctrl_temp);

/**
* ab8500_btemp_get_property() - get the btemp properties
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/mfd/abx500/ab8500-bm.h
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ void ab8500_fg_reinit(void);
void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA);
struct ab8500_btemp *ab8500_btemp_get(void);
int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp);
int ab8500_btemp_get_temp(struct ab8500_btemp *btemp);
struct ab8500_fg *ab8500_fg_get(void);
int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev);
int ab8500_fg_inst_curr_start(struct ab8500_fg *di);
Expand Down

0 comments on commit e9d45e7

Please sign in to comment.