From patchwork Sun Nov 4 12:55:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 10672907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BFDC813BF for ; Wed, 7 Nov 2018 18:57:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B012C2CD8C for ; Wed, 7 Nov 2018 18:57:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A42CC2CDBD; Wed, 7 Nov 2018 18:57:15 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham 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 A78212CD8C for ; Wed, 7 Nov 2018 18:57:14 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A15F426773F; Wed, 7 Nov 2018 19:57:10 +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 9A174267831; Sun, 4 Nov 2018 13:55:38 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by alsa0.perex.cz (Postfix) with ESMTP id EE2B926773F for ; Sun, 4 Nov 2018 13:55:35 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id g59-v6so3108294plb.10 for ; Sun, 04 Nov 2018 04:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WXAewJDXDzYaN5Foswz70U2PjKMjY8rdpZEmG1i03ho=; b=uOplY7hrncZcHQ7zJyc46rz3mruQyjQZkSKBNrX/vFARmFsEUMRIEISceMLxUcs/OY IV9cgkzEfHdAzTxO3NuH9zvGIzQLJ7zEcHY6JY3ilzlBx1InTssMWz4X9tWK9Cpf1y/L wXFrSRgKwuVDbyrUc5hqFFURtXRoq+8bfIQwiw107+yU2hwqAqfJXcyxdcm65n6Pe/Fw PAA9xfGOL3/plGtG6Pg4h2gWI7lhk+kc83GsHgmXgMA8525rUF8HTf3mIiU/dGKSTfFI oQ22Ce8PLqspkHdkdutZMtVuBRixF24flgGIjdi6Y4PKFKDNZdKUEPiu6cfQgPHdHGCW T3zw== 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; bh=WXAewJDXDzYaN5Foswz70U2PjKMjY8rdpZEmG1i03ho=; b=NbkgoLiiUfwLaqOQnmZky2Brx+ncJ70f/+lKgu9kECWIp9QQvfx1YL5Fa9a2QosZdk +kR9vJ15N55T52puBHe7HJh6ukQyvTr6L3OVHb55UMroTnbcRxUEZfn5QSzD0BoG5jsP J3weRjHlEjYAdK+rbyTPZxNpLBpmjbW0w7HB6LLdtVirrLJj9wQLNVpGp7MAvBSOZ6su ju7By+xpbgV3jbQY6Lvz1GY2gxBevuJ9EBCJGVvae56UV6WBCdjubxDeatsAZ/asPc+f qX/+FlI+HeIo6rQkov3fK1pom54/4QS7Z/yY0Yxzd+Il22Ug/CFNAKTdOrjhtaRf3Jea KuSA== X-Gm-Message-State: AGRZ1gKQ2vMSJffDveVGKuPmngLreotzyyEgdXay0fqJAZGPxvYqi2Mt 9twwlArf7uz4eS5GyyrTy5g= X-Google-Smtp-Source: AJdET5ffck4Wz9T2BHoHJA8Rg0klAJJPYzT9ikPyZ2NHricE2H5zERXQRgbVBMqBbtK1Xn6E+OhPjQ== X-Received: by 2002:a17:902:8bc6:: with SMTP id r6-v6mr4264995plo.194.1541336134057; Sun, 04 Nov 2018 04:55:34 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id p62-v6sm58614084pfp.111.2018.11.04.04.55.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Nov 2018 04:55:33 -0800 (PST) From: Yangtao Li To: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, KCHSU0@nuvoton.com, gustavo@embeddedor.com, abhijeet.kumar@intel.com, kuninori.morimoto.gx@renesas.com Date: Sun, 4 Nov 2018 07:55:29 -0500 Message-Id: <20181104125529.3681-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 X-Mailman-Approved-At: Wed, 07 Nov 2018 19:57:08 +0100 Cc: Yangtao Li , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] SoC: nau8825: remove unnecessary unlikely() 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 WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by: Yangtao Li --- sound/soc/codecs/nau8825.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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);