From patchwork Mon Nov 27 18:51:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 119767 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp2098225edl; Mon, 27 Nov 2017 10:52:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMYNVgiL8VJ7W2oy5sfE2YuFAhUXb0yFLUvFSxoCNFP0BM+MoTCeC85Hv53UOtl266GOIE72 X-Received: by 10.223.179.215 with SMTP id x23mr10043482wrd.198.1511808731040; Mon, 27 Nov 2017 10:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511808731; cv=none; d=google.com; s=arc-20160816; b=dluZR+iNpODgx2edcMEIhogl1PtxZU00tzRAN30Rqf135Xj0mFUQkktSSBA2PR1Xjh 3g+/t6A03qmVsNRirlV0SmfFXVhVW81LfYn3dSoXGb2Dh2H0Vj2oJHt3Hd/ZtVLhmfok RWic3yQg/w87+/kSRgFfq+qoLlVn3SOvU578Mb7e5BnVIGBnWKs3ktP2tsb3iHP2cUA/ V+cZ94Y1Ntzcen+DtubKgwTNqqpvJ24hBnCedD+JbVSl9pDoR3r8JFA8BEER9XoPhY/H epihOqftGTjvCch8CVlvGi/emN2eGKixl/zPX+os9TfdMv8mWcBSLrwwRbEYheHZfMcK AXwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=jBPvBLxMPn1rwG0Y6gPPhCu04sMQdQZSPVgT3326TOM=; b=aUp+qKjkBrtG/otorUe2fmsfk2zOMVB8X2JTw8M2aSc0RXmdg1jqP0lV7jZ65jays8 kJb7NLsP6AYHSakEjoYpbnLf3AGmYIgvBFFuY2ZcFe50iZu8qbNqPSdxU4iucWKsZ6fS BkHK6+2r9o8tvw8hOIZ03ekoBE+WgSVNsIjcbSKJsCFxyKnxLnSr5zd1NPNkgpVX7c4K Sdh/AB7EWbJps60US0X7lA/hU3RfoXY0L40d7+RDeJLqv7R/H3O2OKnwWCikPZzNz6+4 uV5oO/7LMgqdw1qyc41G+MLCoX9RxjB+zBA3VAERmTMr2pckXAQr1Oqr5HVveYm8bbwg b8eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=toh9tbgE; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q29si19123835wrc.474.2017.11.27.10.52.10; Mon, 27 Nov 2017 10:52:11 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=toh9tbgE; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A853E267549; Mon, 27 Nov 2017 19:51:55 +0100 (CET) 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 6CA7B267545; Mon, 27 Nov 2017 19:51:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 1BC12267544 for ; Mon, 27 Nov 2017 19:51:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=s2TRsMn3rWllzKBzNdkbhop526ZqJtoENDQXrAB2dcY=; b=toh9tbgESqVF hvnZ1ExREBFt7oc/sMB51CISk2YMrXbNQh5a0SfDmxbmw7XUVKMs/LQiYorvyr+lKTyUQnGdV89LL /svfxiIGmZZubY45xA8ki1ATBobhsTPMGU/mFNS0vioARVgXiN4YAoAZUl2z5gcw3q1SLxcGMvM+C Km6/U=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eJOVO-0006ys-3K; Mon, 27 Nov 2017 18:51:46 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eJOVN-0006mS-MY; Mon, 27 Nov 2017 18:51:45 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87ziafklgc.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 27 Nov 2017 18:51:45 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: don't use snd_soc_write/read on twl6040" to the asoc tree 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 The patch ASoC: don't use snd_soc_write/read on twl6040 has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 93a00c467fe998bf5716cbc9cabc127046054782 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 14 Nov 2017 01:04:58 +0000 Subject: [PATCH] ASoC: don't use snd_soc_write/read on twl6040 twl6040 doesn't use regmap nor reg_cache. Its write/read are done through twl6040_reg_write/read. This driver directly calling these functions, but sometimes using snd_soc_write/read. As part of cleanup, snd_soc_codec_driver::write, read will be removed soon. Then, write/read access through snd_soc_write/read will doesn't work on this driver, since it doesn't use regmap nor reg_cache. This patch replace snd_soc_write/read to twl6040_write/read. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/twl6040.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index a8e6941a1868..3b895b4b451c 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -543,7 +543,7 @@ int twl6040_get_dl1_gain(struct snd_soc_codec *codec) if (snd_soc_dapm_get_pin_status(dapm, "HSOR") || snd_soc_dapm_get_pin_status(dapm, "HSOL")) { - u8 val = snd_soc_read(codec, TWL6040_REG_HSLCTL); + u8 val = twl6040_read(codec, TWL6040_REG_HSLCTL); if (val & TWL6040_HSDACMODE) /* HSDACL in LP mode */ return -8; /* -8dB */ @@ -1158,8 +1158,6 @@ static int twl6040_remove(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .probe = twl6040_probe, .remove = twl6040_remove, - .read = twl6040_read, - .write = twl6040_write, .set_bias_level = twl6040_set_bias_level, .suspend_bias_off = true, .ignore_pmdown_time = true,