From patchwork Mon Nov 5 11:58:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150180 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2507199ljp; Mon, 5 Nov 2018 03:59:00 -0800 (PST) X-Google-Smtp-Source: AJdET5cLp5xnyjeaeLbcYo+YjzTgWNwX97zIkDQRrPzO2+eEFVW5PBgh8dYfwd3KNjAic3FVQScY X-Received: by 2002:a5d:6a8d:: with SMTP id s13-v6mr4092977wru.179.1541419139998; Mon, 05 Nov 2018 03:58:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541419139; cv=none; d=google.com; s=arc-20160816; b=fX1uBbW5W+5iqJU0qUnSRQDUfmhAtQEYdajtvjIcYT9JRXOSAWVWQmNPgWRq+LUpbH lLXVR8V/br9N3NK2Q3u3m7cGVg6hgwsXntLCC8c2rSYv1A3LT6u3R62ApXeyRBWK/0Oj KEeEyCGh5QKnDMxw+emOEbD5HSKGYyhqHSG0zzzWQKeItzAilNFbEkSty3wwhX1KPk2k ycbk/lLHsXWtTsxfs6RO6ENeex5WFRB46MjGaD+lj5142Oet3oNA7MdhLtBqbP0c0FVG n29v0hn44dHcWoeVF18FBWiyOQXuEOKFbCDEr38yg3tJVAg1dKLU0F20O9aOMozELnbv zaqg== 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; bh=IdL6YsjvCVsIaiZyQXCZYNBweY5ov+10pbPBEMDRYEY=; b=rVhzAiV10kJwv/+1sFliQL43tFy81cPlOy6td60imMh80BwYhatCIR2bRCTNgsIVKP adxx+Bz/rzQ12WfoitZWr0wOUhYfe3Zm65yWt9I0zjFMdOwqDEfY+DbfQ+R7Rm3gZsCW Ftzk8alhObFyC5/Ugox6NtGnPT5zxElpTcCLnyjyNAnS43bVIvGgSYWBL7IQZIU6kpuM KfAf3UkRWEec4FLpFciOu8bJy5PmWDfdUeNhesJHMStiPHHgWIoua+hIRxNetr5imGAc 50PySadSws2Lq56bNCDVeTcGUVRIJ6XiudFDkx9TUUlGwTASe+D+/gOCVZWeY0BSRzlQ dbzg== 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=LrRCS51D; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id x184-v6si27602123wmx.42.2018.11.05.03.58.59; Mon, 05 Nov 2018 03:58:59 -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=LrRCS51D; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3671D267A70; Mon, 5 Nov 2018 12:58:58 +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 869B02679F7; Mon, 5 Nov 2018 12:58:55 +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,RCVD_IN_DNSWL_NONE 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 E84752678DA for ; Mon, 5 Nov 2018 12:58:53 +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=iW9KjnYs0azz0xX1nJn0qMBQFnuT4MFkyu3w/Re/mlg=; b=LrRCS51Dtxrm qAxD/Z4WlPFJCxWrudW9WaoNZjNJ9N72vrDIYUkQnQL5lAHjWppyToKhh7o16hiaLLpOguAahXfN+ b8isvUoa+tFW9nUmRifPB4HBjkpJidcreKKHleFQ6NHpnJMGWPQEXfWRG5YdmvE0s9ftgYyUvVDss 7kYJA=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gJdWv-0008Ii-Px; Mon, 05 Nov 2018 11:58:53 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 81FF41124D98; Mon, 5 Nov 2018 11:58:53 +0000 (GMT) From: Mark Brown To: Yangtao Li In-Reply-To: Message-Id: <20181105115853.81FF41124D98@debutante.sirena.org.uk> Date: Mon, 5 Nov 2018 11:58:53 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: nau8825: remove unnecessary unlikely()" 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: nau8825: remove unnecessary unlikely() 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 0b6277e6343e192aaa7d452ab933281eb0d420dc Mon Sep 17 00:00:00 2001 From: Yangtao Li Date: Sun, 4 Nov 2018 07:55:29 -0500 Subject: [PATCH] ASoC: nau8825: remove unnecessary unlikely() WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by: Yangtao Li Signed-off-by: Mark Brown --- sound/soc/codecs/nau8825.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index b9fed99d8b5e..7bbcbf5f05c8 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -424,10 +424,8 @@ static u32 nau8825_xtalk_sidetone(u32 sig_org, u32 sig_cros) { u32 gain, sidetone; - if (unlikely(sig_org == 0) || unlikely(sig_cros == 0)) { - WARN_ON(1); + if (WARN_ON(sig_org == 0 || sig_cros == 0)) return 0; - } sig_org = nau8825_intlog10_dec3(sig_org); sig_cros = nau8825_intlog10_dec3(sig_cros);