mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branches 'thermal-core' and 'thermal-intel' of .git into next
This commit is contained in:
commit
5a924a07f8
44 changed files with 509 additions and 197 deletions
|
|
@ -104,7 +104,7 @@ static inline long lm75_reg_to_mc(s16 temp, u8 resolution)
|
|||
|
||||
/* sysfs attributes for hwmon */
|
||||
|
||||
static int lm75_read_temp(void *dev, long *temp)
|
||||
static int lm75_read_temp(void *dev, int *temp)
|
||||
{
|
||||
struct lm75_data *data = lm75_update_device(dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ static int ntc_thermistor_get_ohm(struct ntc_data *data)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int ntc_read_temp(void *dev, long *temp)
|
||||
static int ntc_read_temp(void *dev, int *temp)
|
||||
{
|
||||
struct ntc_data *data = dev_get_drvdata(dev);
|
||||
int ohm;
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ static struct tmp102 *tmp102_update_device(struct device *dev)
|
|||
return tmp102;
|
||||
}
|
||||
|
||||
static int tmp102_read_temp(void *dev, long *temp)
|
||||
static int tmp102_read_temp(void *dev, int *temp)
|
||||
{
|
||||
struct tmp102 *tmp102 = tmp102_update_device(dev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue