Merge tag 'usb-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / iio / adc / nau7802.c

diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index 976c235..c1261ec 100644 (file)
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -8,10 +8,11 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
+#include <linux/property.h>
 #include <linux/wait.h>
 #include <linux/log2.h>
-#include <linux/of.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -407,21 +408,14 @@ static const struct iio_info nau7802_info = {
        .attrs = &nau7802_attribute_group,
 };
 
-static int nau7802_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int nau7802_probe(struct i2c_client *client)
 {
        struct iio_dev *indio_dev;
        struct nau7802_state *st;
-       struct device_node *np = client->dev.of_node;
        int i, ret;
        u8 data;
        u32 tmp = 0;
 
-       if (!client->dev.of_node) {
-               dev_err(&client->dev, "No device tree node available.\n");
-               return -EINVAL;
-       }
-
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
        if (indio_dev == NULL)
                return -ENOMEM;
@@ -457,7 +451,7 @@ static int nau7802_probe(struct i2c_client *client,
        if (!(ret & NAU7802_PUCTRL_PUR_BIT))
                return ret;
 
-       of_property_read_u32(np, "nuvoton,vldo", &tmp);
+       device_property_read_u32(&client->dev, "nuvoton,vldo", &tmp);
        st->vref_mv = tmp;
 
        data = NAU7802_PUCTRL_PUD_BIT | NAU7802_PUCTRL_PUA_BIT |
@@ -550,7 +544,7 @@ static const struct of_device_id nau7802_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, nau7802_dt_ids);
 
 static struct i2c_driver nau7802_driver = {
-       .probe = nau7802_probe,
+       .probe_new = nau7802_probe,
        .id_table = nau7802_i2c_id,
        .driver = {
                   .name = "nau7802",