Skip to content

Commit

Permalink
ASoC: ts3a227e: use device property api
Browse files Browse the repository at this point in the history
replace of_property_read_u32 with device_property_read_u32

Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Fang, Yang A authored and Mark Brown committed Jun 2, 2015
1 parent b787f68 commit a650bb3
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions sound/soc/codecs/ts3a227e.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit a650bb3

Please sign in to comment.