From: Tushar Behera Date: Thu, 22 Nov 2012 04:08:37 +0000 (+0530) Subject: ASoC: wm8741: Convert to use devm_regmap_init_{spi,i2c}() X-Git-Tag: v3.8-rc1~29^2~5^2~47^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd64c455601ff20a83c52892d1bc8343bec0b6b7;p=profile%2Fivi%2Fkernel-x86-ivi.git ASoC: wm8741: Convert to use devm_regmap_init_{spi,i2c}() Signed-off-by: Tushar Behera Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 4281a08..99b8ebe 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -522,7 +522,7 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, return ret; } - wm8741->regmap = regmap_init_i2c(i2c, &wm8741_regmap); + wm8741->regmap = devm_regmap_init_i2c(i2c, &wm8741_regmap); if (IS_ERR(wm8741->regmap)) { ret = PTR_ERR(wm8741->regmap); dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret); @@ -582,7 +582,7 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi) return ret; } - wm8741->regmap = regmap_init_spi(spi, &wm8741_regmap); + wm8741->regmap = devm_regmap_init_spi(spi, &wm8741_regmap); if (IS_ERR(wm8741->regmap)) { ret = PTR_ERR(wm8741->regmap); dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);