aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFang, Yang A <yang.a.fang@intel.com>2015-05-29 14:56:11 -0400
committerMark Brown <broonie@kernel.org>2015-06-02 13:17:27 -0400
commita650bb3422acb1fc96d7af28dce1ddde2fb8eb86 (patch)
treebbe7f9ae513645d117b58ae3d81a6250874dcf60
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
ASoC: ts3a227e: use device property api
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>
-rw-r--r--sound/soc/codecs/ts3a227e.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 9fd80ac1897f..12232d7db4c5 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -254,12 +254,13 @@ static const struct regmap_config ts3a227e_regmap_config = {
254 .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults), 254 .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults),
255}; 255};
256 256
257static int ts3a227e_parse_dt(struct ts3a227e *ts3a227e, struct device_node *np) 257static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e,
258 struct device *dev)
258{ 259{
259 u32 micbias; 260 u32 micbias;
260 int err; 261 int err;
261 262
262 err = of_property_read_u32(np, "ti,micbias", &micbias); 263 err = device_property_read_u32(dev, "ti,micbias", &micbias);
263 if (!err) { 264 if (!err) {
264 regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3, 265 regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3,
265 MICBIAS_SETTING_MASK, 266 MICBIAS_SETTING_MASK,
@@ -287,12 +288,10 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
287 if (IS_ERR(ts3a227e->regmap)) 288 if (IS_ERR(ts3a227e->regmap))
288 return PTR_ERR(ts3a227e->regmap); 289 return PTR_ERR(ts3a227e->regmap);
289 290
290 if (dev->of_node) { 291 ret = ts3a227e_parse_device_property(ts3a227e, dev);
291 ret = ts3a227e_parse_dt(ts3a227e, dev->of_node); 292 if (ret) {
292 if (ret) { 293 dev_err(dev, "Failed to parse device property: %d\n", ret);
293 dev_err(dev, "Failed to parse device tree: %d\n", ret); 294 return ret;
294 return ret;
295 }
296 } 295 }
297 296
298 ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt, 297 ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt,