These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / iio / temperature / tmp006.c

diff --git a/kernel/drivers/iio/temperature/tmp006.c b/kernel/drivers/iio/temperature/tmp006.c
index 7a80509..e78c106 100644 (file)
--- a/kernel/drivers/iio/temperature/tmp006.c
+++ b/kernel/drivers/iio/temperature/tmp006.c
@@ -36,13 +36,13 @@
 #define TMP006_CONFIG_DRDY_EN BIT(8)
 #define TMP006_CONFIG_DRDY BIT(7)
 
-#define TMP006_CONFIG_MOD_MASK 0x7000
+#define TMP006_CONFIG_MOD_MASK GENMASK(14, 12)
 
-#define TMP006_CONFIG_CR_MASK 0x0e00
+#define TMP006_CONFIG_CR_MASK GENMASK(11, 9)
 #define TMP006_CONFIG_CR_SHIFT 9
 
-#define MANUFACTURER_MAGIC 0x5449
-#define DEVICE_MAGIC 0x0067
+#define TMP006_MANUFACTURER_MAGIC 0x5449
+#define TMP006_DEVICE_MAGIC 0x0067
 
 struct tmp006_data {
        struct i2c_client *client;
@@ -194,7 +194,7 @@ static bool tmp006_check_identification(struct i2c_client *client)
        if (did < 0)
                return false;
 
-       return mid == MANUFACTURER_MAGIC && did == DEVICE_MAGIC;
+       return mid == TMP006_MANUFACTURER_MAGIC && did == TMP006_DEVICE_MAGIC;
 }
 
 static int tmp006_probe(struct i2c_client *client,
@@ -280,7 +280,6 @@ static struct i2c_driver tmp006_driver = {
        .driver = {
                .name   = "tmp006",
                .pm     = &tmp006_pm_ops,
-               .owner  = THIS_MODULE,
        },
        .probe = tmp006_probe,
        .remove = tmp006_remove,