forked from luck/tmp_suning_uos_patched
thermal: rockchip: consistently use int for temperatures
As Temperature is currently represented as int not long in the thermal framework since use int intead of unsigned long/long to represent temperature to avoid bogus overheat detection when negative temperature reported. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
020ba95dbb
commit
437df2172e
@ -88,7 +88,7 @@ struct rockchip_tsadc_chip {
|
||||
int chn_num;
|
||||
|
||||
/* The hardware-controlled tshut property */
|
||||
long tshut_temp;
|
||||
int tshut_temp;
|
||||
enum tshut_mode tshut_mode;
|
||||
enum tshut_polarity tshut_polarity;
|
||||
|
||||
@ -101,7 +101,7 @@ struct rockchip_tsadc_chip {
|
||||
int (*get_temp)(struct chip_tsadc_table table,
|
||||
int chn, void __iomem *reg, int *temp);
|
||||
void (*set_tshut_temp)(struct chip_tsadc_table table,
|
||||
int chn, void __iomem *reg, long temp);
|
||||
int chn, void __iomem *reg, int temp);
|
||||
void (*set_tshut_mode)(int chn, void __iomem *reg, enum tshut_mode m);
|
||||
|
||||
/* Per-table methods */
|
||||
@ -126,7 +126,7 @@ struct rockchip_thermal_data {
|
||||
|
||||
void __iomem *regs;
|
||||
|
||||
long tshut_temp;
|
||||
int tshut_temp;
|
||||
enum tshut_mode tshut_mode;
|
||||
enum tshut_polarity tshut_polarity;
|
||||
};
|
||||
@ -160,7 +160,7 @@ struct rockchip_thermal_data {
|
||||
|
||||
struct tsadc_table {
|
||||
u32 code;
|
||||
long temp;
|
||||
int temp;
|
||||
};
|
||||
|
||||
static const struct tsadc_table v2_code_table[] = {
|
||||
@ -202,7 +202,7 @@ static const struct tsadc_table v2_code_table[] = {
|
||||
};
|
||||
|
||||
static u32 rk_tsadcv2_temp_to_code(struct chip_tsadc_table table,
|
||||
long temp)
|
||||
int temp)
|
||||
{
|
||||
int high, low, mid;
|
||||
|
||||
@ -356,7 +356,7 @@ static int rk_tsadcv2_get_temp(struct chip_tsadc_table table,
|
||||
}
|
||||
|
||||
static void rk_tsadcv2_tshut_temp(struct chip_tsadc_table table,
|
||||
int chn, void __iomem *regs, long temp)
|
||||
int chn, void __iomem *regs, int temp)
|
||||
{
|
||||
u32 tshut_value, val;
|
||||
|
||||
@ -469,7 +469,7 @@ static int rockchip_configure_from_dt(struct device *dev,
|
||||
|
||||
if (of_property_read_u32(np, "rockchip,hw-tshut-temp", &shut_temp)) {
|
||||
dev_warn(dev,
|
||||
"Missing tshut temp property, using default %ld\n",
|
||||
"Missing tshut temp property, using default %d\n",
|
||||
thermal->chip->tshut_temp);
|
||||
thermal->tshut_temp = thermal->chip->tshut_temp;
|
||||
} else {
|
||||
@ -477,7 +477,7 @@ static int rockchip_configure_from_dt(struct device *dev,
|
||||
}
|
||||
|
||||
if (thermal->tshut_temp > INT_MAX) {
|
||||
dev_err(dev, "Invalid tshut temperature specified: %ld\n",
|
||||
dev_err(dev, "Invalid tshut temperature specified: %d\n",
|
||||
thermal->tshut_temp);
|
||||
return -ERANGE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user