Merge remote-tracking branch 'asoc/topic/rt5670' into asoc-next

[deliverable/linux.git] / sound / soc / codecs / ts3a227e.c

diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 9fd80ac1897f5b369bc14a0420c0b834da748343..12232d7db4c527703646c9713a0471629aac3971 100644 (file)
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -254,12 +254,13 @@ static const struct regmap_config ts3a227e_regmap_config = {
        .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults),
 };
 
-static int ts3a227e_parse_dt(struct ts3a227e *ts3a227e, struct device_node *np)
+static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e,
+                               struct device *dev)
 {
        u32 micbias;
        int err;
 
-       err = of_property_read_u32(np, "ti,micbias", &micbias);
+       err = device_property_read_u32(dev, "ti,micbias", &micbias);
        if (!err) {
                regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3,
                        MICBIAS_SETTING_MASK,
@@ -287,12 +288,10 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
        if (IS_ERR(ts3a227e->regmap))
                return PTR_ERR(ts3a227e->regmap);
 
-       if (dev->of_node) {
-               ret = ts3a227e_parse_dt(ts3a227e, dev->of_node);
-               if (ret) {
-                       dev_err(dev, "Failed to parse device tree: %d\n", ret);
-                       return ret;
-               }
+       ret = ts3a227e_parse_device_property(ts3a227e, dev);
+       if (ret) {
+               dev_err(dev, "Failed to parse device property: %d\n", ret);
+               return ret;
        }
 
        ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt,