|
@@ -362,8 +362,8 @@ static struct pmbus_data *pmbus_update_device(struct device *dev)
|
|
|
* Convert linear sensor values to milli- or micro-units
|
|
|
* depending on sensor type.
|
|
|
*/
|
|
|
-static int pmbus_reg2data_linear(struct pmbus_data *data,
|
|
|
- struct pmbus_sensor *sensor)
|
|
|
+static long pmbus_reg2data_linear(struct pmbus_data *data,
|
|
|
+ struct pmbus_sensor *sensor)
|
|
|
{
|
|
|
s16 exponent;
|
|
|
s32 mantissa;
|
|
@@ -397,15 +397,15 @@ static int pmbus_reg2data_linear(struct pmbus_data *data,
|
|
|
else
|
|
|
val >>= -exponent;
|
|
|
|
|
|
- return (int)val;
|
|
|
+ return val;
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
* Convert direct sensor values to milli- or micro-units
|
|
|
* depending on sensor type.
|
|
|
*/
|
|
|
-static int pmbus_reg2data_direct(struct pmbus_data *data,
|
|
|
- struct pmbus_sensor *sensor)
|
|
|
+static long pmbus_reg2data_direct(struct pmbus_data *data,
|
|
|
+ struct pmbus_sensor *sensor)
|
|
|
{
|
|
|
long val = (s16) sensor->data;
|
|
|
long m, b, R;
|
|
@@ -440,12 +440,12 @@ static int pmbus_reg2data_direct(struct pmbus_data *data,
|
|
|
R++;
|
|
|
}
|
|
|
|
|
|
- return (int)((val - b) / m);
|
|
|
+ return (val - b) / m;
|
|
|
}
|
|
|
|
|
|
-static int pmbus_reg2data(struct pmbus_data *data, struct pmbus_sensor *sensor)
|
|
|
+static long pmbus_reg2data(struct pmbus_data *data, struct pmbus_sensor *sensor)
|
|
|
{
|
|
|
- int val;
|
|
|
+ long val;
|
|
|
|
|
|
if (data->info->direct[sensor->class])
|
|
|
val = pmbus_reg2data_direct(data, sensor);
|
|
@@ -619,7 +619,7 @@ static int pmbus_get_boolean(struct pmbus_data *data, int index, int *val)
|
|
|
if (!s1 && !s2)
|
|
|
*val = !!regval;
|
|
|
else {
|
|
|
- int v1, v2;
|
|
|
+ long v1, v2;
|
|
|
struct pmbus_sensor *sensor1, *sensor2;
|
|
|
|
|
|
sensor1 = &data->sensors[s1];
|
|
@@ -661,7 +661,7 @@ static ssize_t pmbus_show_sensor(struct device *dev,
|
|
|
if (sensor->data < 0)
|
|
|
return sensor->data;
|
|
|
|
|
|
- return snprintf(buf, PAGE_SIZE, "%d\n", pmbus_reg2data(data, sensor));
|
|
|
+ return snprintf(buf, PAGE_SIZE, "%ld\n", pmbus_reg2data(data, sensor));
|
|
|
}
|
|
|
|
|
|
static ssize_t pmbus_set_sensor(struct device *dev,
|