From patchwork Thu Nov 22 04:08:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 13055 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 4E0444C178B for ; Thu, 22 Nov 2012 04:15:24 +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 03473A1897E for ; Thu, 22 Nov 2012 04:15:23 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so48424ieb.11 for ; Wed, 21 Nov 2012 20:15:23 -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=8t88biCTQctUsLvOQi9f90gaqCDLyptsdXFusXoq1yM=; b=JA3GgYerowbpuqZ5N0uIYqGyrVAoIW3/RS43GlimeiD05gzAuPXWnkqiOWDVFsTmb0 Dq3kycdvPVINaeWg2UmuEpoITZLg1G91fVvMlL8HqQKo53A9bVxXEQeFleooEzFHDzXs ihJTfi4YJgL4OgPKjWnalw6tq8W3P5/NsO7+5N7fJzV/xUo9ZX05Pkt2EUgV9ggcEoBi jY12+2BDHOF5eY8n8Ti1Tt3WSttbp5d3P3On6GO+uVKgPMe55BxCCAJciKrjUg3SsC5X bSdZWrMEUQ9R8wnN3pQAiLgd6MrN4Jn87y3RSMeiTKZbEgNday80wSwNOR9PW2Xkm6fd 4VjA== Received: by 10.50.213.69 with SMTP id nq5mr1743428igc.70.1353557723754; Wed, 21 Nov 2012 20:15:23 -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 n20csp147899igt; Wed, 21 Nov 2012 20:15:23 -0800 (PST) Received: by 10.68.231.41 with SMTP id td9mr639726pbc.128.1353557723191; Wed, 21 Nov 2012 20:15:23 -0800 (PST) Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by mx.google.com with ESMTPS id az5si3378193pbd.144.2012.11.21.20.15.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 20:15:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.43 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.160.43; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.43 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-pb0-f43.google.com with SMTP id wz17so5275459pbc.2 for ; Wed, 21 Nov 2012 20:15:23 -0800 (PST) Received: by 10.68.230.66 with SMTP id sw2mr673046pbc.119.1353557722954; Wed, 21 Nov 2012 20:15:22 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id s7sm1164602paz.7.2012.11.21.20.15.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 20:15:21 -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 06/10] ASoC: wm8753: Convert to use devm_regmap_init_{spi, i2c}() Date: Thu, 22 Nov 2012 09:38:38 +0530 Message-Id: <1353557322-25353-7-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: ALoCoQn4DkekAu07Zp0a6rI8dYHxTL9b5JUGn0HZ3+FHST1oIDADnZCkbOt0e85xikkbUAYeB1/0 Signed-off-by: Tushar Behera --- sound/soc/codecs/wm8753.c | 32 ++++++-------------------------- 1 files changed, 6 insertions(+), 26 deletions(-) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 9914215..50a5dc7 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1562,35 +1562,25 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, wm8753); - wm8753->regmap = regmap_init_spi(spi, &wm8753_regmap); + wm8753->regmap = devm_regmap_init_spi(spi, &wm8753_regmap); if (IS_ERR(wm8753->regmap)) { ret = PTR_ERR(wm8753->regmap); dev_err(&spi->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_wm8753, wm8753_dai, ARRAY_SIZE(wm8753_dai)); - if (ret != 0) { + if (ret != 0) dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret); - goto err_regmap; - } - return 0; - -err_regmap: - regmap_exit(wm8753->regmap); -err: return ret; } static int __devexit wm8753_spi_remove(struct spi_device *spi) { - struct wm8753_priv *wm8753 = spi_get_drvdata(spi); - snd_soc_unregister_codec(&spi->dev); - regmap_exit(wm8753->regmap); return 0; } @@ -1619,35 +1609,25 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, wm8753); - wm8753->regmap = regmap_init_i2c(i2c, &wm8753_regmap); + wm8753->regmap = devm_regmap_init_i2c(i2c, &wm8753_regmap); if (IS_ERR(wm8753->regmap)) { ret = PTR_ERR(wm8753->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8753, wm8753_dai, ARRAY_SIZE(wm8753_dai)); - if (ret != 0) { + if (ret != 0) dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); - goto err_regmap; - } - return 0; - -err_regmap: - regmap_exit(wm8753->regmap); -err: return ret; } static __devexit int wm8753_i2c_remove(struct i2c_client *client) { - struct wm8753_priv *wm8753 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - regmap_exit(wm8753->regmap); return 0; }