From patchwork Wed Apr 4 21:49:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Eckhoff X-Patchwork-Id: 10323441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42E136032A for ; Wed, 4 Apr 2018 21:50:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32E7628C21 for ; Wed, 4 Apr 2018 21:50:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 278F929039; Wed, 4 Apr 2018 21:50:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44BBD28C21 for ; Wed, 4 Apr 2018 21:50:11 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1430026763F; Wed, 4 Apr 2018 23:50:10 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 40AEB267647; Wed, 4 Apr 2018 23:50:07 +0200 (CEST) Received: from mail-ot0-f194.google.com (mail-ot0-f194.google.com [74.125.82.194]) by alsa0.perex.cz (Postfix) with ESMTP id 3F38A26763F for ; Wed, 4 Apr 2018 23:50:05 +0200 (CEST) Received: by mail-ot0-f194.google.com with SMTP id o9-v6so25056733otj.5 for ; Wed, 04 Apr 2018 14:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UT+ZaBZkKQ4NuL9H5E3AW3f9RyqlxeY34iRmnEocXDY=; b=UOtgXqOmBOL3Aaq6uD4eTBP2b1bfw0s2PSgNz50IdASfqHxYxpNjGB+tkxrytsSKVG Eoiqg3QSpRbBS6pyF9LTIF8H+YvbOdB/PHc474uHnvup24KCptexhvRbzu9yBRohA595 xmroGXz2vSrMDhWDcbjsYPo56br3H/2YHH/5DxdymURZBk3M7nRGgPxqcZsQKC1OHPOV ACAIXTls5rckDXK4pl1/9LRLSHyqcFipaOhUhdIHcY2jzavHgyQQ/OXUki3B961jR/dH whgUh/XCkhgjy29zUhAGMAHP4LEH/zlrrbKM9a86SjWzONPdSxR0JO4XowSSnNLyAQcI nonw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UT+ZaBZkKQ4NuL9H5E3AW3f9RyqlxeY34iRmnEocXDY=; b=m76Y6Id3xc6tJdEAG5LxvI1nc77GZz6XmfIM5+iVYqS5KlhtO5WZNarhNN2q5Y1SI6 bk0ByKocS3+kZXLaJ7Zjztay7eMCv3X/QB3dd8l77rlZBmLhVFmV2OUvRQvBfbfqZVef A2Dj68ZCVzV6iJY5Q5//YdjFFu9KuMrC7gt7kM/WeCZNNVISZvI+9SzyaVuRboVbNV52 imVuf2wuI0cbIbGZgyqFIutekEGLTJ7FEjLQVxiEYwPW7+1fV8a0omBEzkXqZK4jKmLr reXRILjK35f6iY3PTMrIJAVvz5tzGoXwlbfzSJTJTDSJr71Ks338Tw/+HE1TPE71eA/z BQ9A== X-Gm-Message-State: ALQs6tC9Bvc5wcZHXRZa1M+zKKRqMbd+cRaxmTOIt9rRqBEFflU8r42l LEYnSj1ldERXOJWseRTDf3WqqA== X-Google-Smtp-Source: AIpwx49mwNuwVTuOifCP62ZfQ7/tx2x5EqMvRxy7AV2AiTkuipJYCWBzZ5IXRszOkCjlTvgM9ugDUg== X-Received: by 2002:a9d:419a:: with SMTP id p26-v6mr11407359ote.350.1522878604145; Wed, 04 Apr 2018 14:50:04 -0700 (PDT) Received: from t7-ThinkPad-E560.tsiusa.local ([71.41.190.130]) by smtp.googlemail.com with ESMTPSA id a10-v6sm3823606otc.27.2018.04.04.14.50.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 14:50:03 -0700 (PDT) From: Steven Eckhoff To: alsa-devel@alsa-project.org Date: Wed, 4 Apr 2018 16:49:51 -0500 Message-Id: <20180404214952.12636-2-steven.eckhoff.opensource@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180404214952.12636-1-steven.eckhoff.opensource@gmail.com> References: <20180404214952.12636-1-steven.eckhoff.opensource@gmail.com> Cc: linux-kernel@vger.kernel.org, Takashi Iwai , Mark Brown , Liam Girdwood Subject: [alsa-devel] [RESEND PATCH 2/3 v3] ASoC: TSCS42xx: Cleanup private data members X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Remove blrcm from private data Remove dev from private data Signed-off-by: Steven Eckhoff --- sound/soc/codecs/tscs42xx.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index 5ad68e5538ae..bf207b0345f1 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -31,7 +31,6 @@ struct tscs42xx { int bclk_ratio; int samplerate; - unsigned int blrcm; struct mutex audio_params_lock; u8 coeff_ram[COEFF_RAM_SIZE]; @@ -41,8 +40,6 @@ struct tscs42xx { struct mutex pll_lock; struct regmap *regmap; - - struct device *dev; }; struct coeff_ram_ctl { @@ -1404,12 +1401,11 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, return ret; } i2c_set_clientdata(i2c, tscs42xx); - tscs42xx->dev = &i2c->dev; tscs42xx->regmap = devm_regmap_init_i2c(i2c, &tscs42xx_regmap); if (IS_ERR(tscs42xx->regmap)) { ret = PTR_ERR(tscs42xx->regmap); - dev_err(tscs42xx->dev, "Failed to allocate regmap (%d)\n", ret); + dev_err(&i2c->dev, "Failed to allocate regmap (%d)\n", ret); return ret; } @@ -1417,21 +1413,21 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, ret = part_is_valid(tscs42xx); if (ret <= 0) { - dev_err(tscs42xx->dev, "No valid part (%d)\n", ret); + dev_err(&i2c->dev, "No valid part (%d)\n", ret); ret = -ENODEV; return ret; } ret = regmap_write(tscs42xx->regmap, R_RESET, RV_RESET_ENABLE); if (ret < 0) { - dev_err(tscs42xx->dev, "Failed to reset device (%d)\n", ret); + dev_err(&i2c->dev, "Failed to reset device (%d)\n", ret); return ret; } ret = regmap_register_patch(tscs42xx->regmap, tscs42xx_patch, ARRAY_SIZE(tscs42xx_patch)); if (ret < 0) { - dev_err(tscs42xx->dev, "Failed to apply patch (%d)\n", ret); + dev_err(&i2c->dev, "Failed to apply patch (%d)\n", ret); return ret; } @@ -1439,10 +1435,10 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, mutex_init(&tscs42xx->coeff_ram_lock); mutex_init(&tscs42xx->pll_lock); - ret = devm_snd_soc_register_component(tscs42xx->dev, + ret = devm_snd_soc_register_component(&i2c->dev, &soc_codec_dev_tscs42xx, &tscs42xx_dai, 1); if (ret) { - dev_err(tscs42xx->dev, "Failed to register codec (%d)\n", ret); + dev_err(&i2c->dev, "Failed to register codec (%d)\n", ret); return ret; }