From patchwork Thu Nov 22 04:08:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 13054 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EF5EC4C178B for ; Thu, 22 Nov 2012 04:15:19 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7D85CA1897E for ; Thu, 22 Nov 2012 04:15:19 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so48424ieb.11 for ; Wed, 21 Nov 2012 20:15:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Xgx0psdw7YR3puTBFHqN2sz7xWghCX1qTpC3+wjEYas=; b=Cu9e0SkmDFhiwWcekBm+JNE9QWGphiNle/5cdpNYRewMhiv4mjbG+XgQ+2sfr8FCgw jop6wqMP3s51twEYPYC3envPTknL1zf44OsmTteLHyxGf6RShqXFQHFFSA0VYAW+A96J iKLrQfOnzgC3r/Ll/B7uZzj/t0YH4iytK3r8iP+GPe3lPizEWgyH1yM8DS+fQ1tYM4pm jt2WVcoqGqlSPDUfdhunvdJTYABa7R6o7l4MoO+92+5/gVjA+uYeu7qYklDd8HeCWAS3 HWy+uNzU9LRSx+J5KJTY2ld2T4gXvS5rOyVtx8cd41nXUrVlPm4nsJipRDuAopsFTIAT TqGA== Received: by 10.43.125.133 with SMTP id gs5mr19423024icc.54.1353557719260; Wed, 21 Nov 2012 20:15:19 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp147890igt; Wed, 21 Nov 2012 20:15:18 -0800 (PST) Received: by 10.68.245.169 with SMTP id xp9mr618512pbc.142.1353557718777; Wed, 21 Nov 2012 20:15:18 -0800 (PST) Received: from mail-da0-f44.google.com (mail-da0-f44.google.com [209.85.210.44]) by mx.google.com with ESMTPS id f5si2863527pav.198.2012.11.21.20.15.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 20:15:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.44 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.210.44; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.44 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-da0-f44.google.com with SMTP id z20so564984dae.31 for ; Wed, 21 Nov 2012 20:15:18 -0800 (PST) Received: by 10.68.252.133 with SMTP id zs5mr591465pbc.152.1353557718545; Wed, 21 Nov 2012 20:15:18 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id s7sm1164602paz.7.2012.11.21.20.15.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 20:15:16 -0800 (PST) From: Tushar Behera To: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com Cc: broonie@opensource.wolfsonmicro.com, patches@linaro.org Subject: [PATCH 05/10] ASoC: wm8741: Convert to use devm_regmap_init_{spi, i2c}() Date: Thu, 22 Nov 2012 09:38:37 +0530 Message-Id: <1353557322-25353-6-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353557322-25353-1-git-send-email-tushar.behera@linaro.org> References: <1353557322-25353-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQlCmnkOFr0JCTaYRSgeeekJMAB7cv/9THw6Hl50sR6q44y5kIbA33iz4Q+AvfUmcWioxj9g Signed-off-by: Tushar Behera --- sound/soc/codecs/wm8741.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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);