UPSTREAM: usb: dwc3: omap: use request_threaded_irq()

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / rockchip-hwmon.c

diff --git a/drivers/hwmon/rockchip-hwmon.c b/drivers/hwmon/rockchip-hwmon.c
index 937f31e44437041222cb6695e517bb9493200711..bed728ed4e49d7fb5eb82f7d2d4be0f871959e1e 100755 (executable)
--- a/drivers/hwmon/rockchip-hwmon.c
+++ b/drivers/hwmon/rockchip-hwmon.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/workqueue.h>
+#include <linux/rockchip/common.h>
 #include "hwmon-rockchip.h"
 
 
@@ -67,8 +68,8 @@ static void tsadc_monitor(struct work_struct *work)
                if (data->max[i] < data->min[i])
                        continue;
 
-               temp = data->ops.read_sensor(data->tsadc_addr[i]);
-               if (temp == 150) {
+               temp = data->ops.read_sensor(i);
+               if (temp == INVALID_TEMP) {
                        dev_err(&data->pdev->dev, "TSADC read failed\n");
                        continue;
                }
@@ -140,9 +141,8 @@ static ssize_t show_input(struct device *dev,
        int  temp;
        struct rockchip_temp *data = dev_get_drvdata(dev);
        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
-       u8 tsadc_addr = data->tsadc_addr[attr->index];
 
-       temp = data->ops.read_sensor(tsadc_addr);
+       temp = data->ops.read_sensor(attr->index);
 
        return sprintf(buf, "%d\n", temp);
 }