Merge tag 'sound-fix-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / drivers / iio / health / max30102.c

diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c
index d9b2ed8..b35557a 100644 (file)
--- a/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@ -2,7 +2,7 @@
 /*
  * max30102.c - Support for MAX30102 heart rate and pulse oximeter sensor
  *
- * Copyright (C) 2017 Matt Ranostay <matt@ranostay.consulting>
+ * Copyright (C) 2017 Matt Ranostay <matt.ranostay@konsulko.com>
  *
  * Support for MAX30105 optical particle sensor
  * Copyright (C) 2017 Peter Meerwald-Stadler <pmeerw@pmeerw.net>
@@ -19,7 +19,7 @@
 #include <linux/irq.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
 #include <linux/regmap.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
@@ -323,11 +323,10 @@ static int max30102_get_current_idx(unsigned int val, int *reg)
 static int max30102_led_init(struct max30102_data *data)
 {
        struct device *dev = &data->client->dev;
-       struct device_node *np = dev->of_node;
        unsigned int val;
        int reg, ret;
 
-       ret = of_property_read_u32(np, "maxim,red-led-current-microamp", &val);
+       ret = device_property_read_u32(dev, "maxim,red-led-current-microamp", &val);
        if (ret) {
                dev_info(dev, "no red-led-current-microamp set\n");
 
@@ -346,7 +345,7 @@ static int max30102_led_init(struct max30102_data *data)
                return ret;
 
        if (data->chip_id == max30105) {
-               ret = of_property_read_u32(np,
+               ret = device_property_read_u32(dev,
                        "maxim,green-led-current-microamp", &val);
                if (ret) {
                        dev_info(dev, "no green-led-current-microamp set\n");
@@ -368,7 +367,7 @@ static int max30102_led_init(struct max30102_data *data)
                        return ret;
        }
 
-       ret = of_property_read_u32(np, "maxim,ir-led-current-microamp", &val);
+       ret = device_property_read_u32(dev, "maxim,ir-led-current-microamp", &val);
        if (ret) {
                dev_info(dev, "no ir-led-current-microamp set\n");
 
@@ -624,7 +623,7 @@ MODULE_DEVICE_TABLE(of, max30102_dt_ids);
 static struct i2c_driver max30102_driver = {
        .driver = {
                .name   = MAX30102_DRV_NAME,
-               .of_match_table = of_match_ptr(max30102_dt_ids),
+               .of_match_table = max30102_dt_ids,
        },
        .probe          = max30102_probe,
        .remove         = max30102_remove,
@@ -632,6 +631,6 @@ static struct i2c_driver max30102_driver = {
 };
 module_i2c_driver(max30102_driver);
 
-MODULE_AUTHOR("Matt Ranostay <matt@ranostay.consulting>");
+MODULE_AUTHOR("Matt Ranostay <matt.ranostay@konsulko.com>");
 MODULE_DESCRIPTION("MAX30102 heart rate/pulse oximeter and MAX30105 particle sensor driver");
 MODULE_LICENSE("GPL");