From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBC96C433E7 for ; Sun, 11 Oct 2020 20:22:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 994CD20657 for ; Sun, 11 Oct 2020 20:22:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="viDAZe4T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729223AbgJKUWs (ORCPT ); Sun, 11 Oct 2020 16:22:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729177AbgJKUWm (ORCPT ); Sun, 11 Oct 2020 16:22:42 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB721C0613CE; Sun, 11 Oct 2020 13:22:41 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id b69so16038414qkg.8; Sun, 11 Oct 2020 13:22:41 -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 :mime-version:content-transfer-encoding; bh=Ea2bMDY+7Atak4iYHdqvWHBnQ1Tr+61Ua/grysCoKFo=; b=viDAZe4TMWEol4DAJzWCfa6i/wuSbOyc/in/X1txkZUzrqm9Ose0DRvE7Q8Pgz6Bo1 Rk4NchWulvwKBTrPlj86iVV8JvIO6Ks8n8yzIwBCI+O0/ZBMvo0c7MZL3mqp39apBEz9 D8QyVt5Eo4sWoy0VlVDSAmg73gSsHsERuHNHdHqxzgh7CwRaErLMQy4ZUG9ALszimNw6 vJhjODhex4JjjXg9bDPdwoAdLuEBv81CWs7QzEFDCpKe0kHkD3RK8LZs0NjGZX6f2leM X4tzuOCWRhwDGbkesUSdzW6R4MCwyNMt0RXGI6XJSnNxLnjEXY7z0WUEUCbad2ncYrhT rUfQ== 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:mime-version:content-transfer-encoding; bh=Ea2bMDY+7Atak4iYHdqvWHBnQ1Tr+61Ua/grysCoKFo=; b=FPSF09vOGHW2GOQ0XXXAOznYWzyVlOASUV//f5f4Rf2kD7aSoH2hj19mXyt1uxSrw0 k3yRFTiBiKgtfMq4WPvT2p2SSBwoDc4uY8ILKKPRkQVFNVlcY/VJWjP6th+bGd5xfGf3 r2qnRSCs33gU1qOXrBNt+Q8+xn2YAhssx19/iXyo2BB11kqwwyuBmwA16tkeO7PPqUHW XZwuulY6Rk497HIHlqS+ze+LQ1YIo4QRnH5JOfUB8Gg6oUoatTxFvO36LX6IC8Fwps1B PX2PJDhgp5Oo2ZbSe4V3l6Kly9QST5nKPCe3gDRv2Zzwxn8IKaZdyTguDSH5LfqRuzxl inAA== X-Gm-Message-State: AOAM530Tvz2EBCGRE2kOz1FJ4N7Z7Y1hkCg/R0INz6fequJP3HS6byDZ AFjM26CaTMEfuMhWlCKH9WY= X-Google-Smtp-Source: ABdhPJxlKKKEsMVcozlozKKv5SKcqI62kC61EAd/GfvQBlf1yWRaMfjo0s9NSo2xkXj6XjwtuLv2QQ== X-Received: by 2002:a37:7286:: with SMTP id n128mr7136938qkc.423.1602447760882; Sun, 11 Oct 2020 13:22:40 -0700 (PDT) Received: from clement-Latitude-7490.numericable.fr (213-245-241-245.rev.numericable.fr. [213.245.241.245]) by smtp.gmail.com with ESMTPSA id c72sm2987778qkg.56.2020.10.11.13.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 13:22:40 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Jernej Skrabec , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v7 03/14] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit Date: Sun, 11 Oct 2020 22:22:13 +0200 Message-Id: <20201011202224.47544-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201011202224.47544-1-peron.clem@gmail.com> References: <20201011202224.47544-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i when calling get_wss() the function return 4 instead of 3. Replace this with a simpler switch case. Also drop the i2s params which is unused and return a simple int as returning an error code could be out of range for an s8 and there is no optim to return a s8 here. Fixes: 619c15f7fac9 ("ASoC: sun4i-i2s: Change SR and WSS computation") Reviewed-by: Chen-Yu Tsai Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 1f577dbc20a6..f1fdb9a0ba54 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -175,8 +175,8 @@ struct sun4i_i2s_quirks { unsigned int num_mclk_dividers; unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *); - s8 (*get_sr)(const struct sun4i_i2s *, int); - s8 (*get_wss)(const struct sun4i_i2s *, int); + int (*get_sr)(unsigned int width); + int (*get_wss)(unsigned int width); int (*set_chan_cfg)(const struct sun4i_i2s *i2s, unsigned int channels, unsigned int slots, unsigned int slot_width); @@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, return 0; } -static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width) +static int sun4i_i2s_get_sr(unsigned int width) { - if (width < 16 || width > 24) - return -EINVAL; - - if (width % 4) - return -EINVAL; + switch (width) { + case 16: + return 0; + case 20: + return 1; + case 24: + return 2; + } - return (width - 16) / 4; + return -EINVAL; } -static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width) +static int sun4i_i2s_get_wss(unsigned int width) { - if (width < 16 || width > 32) - return -EINVAL; - - if (width % 4) - return -EINVAL; + switch (width) { + case 16: + return 0; + case 20: + return 1; + case 24: + return 2; + case 32: + return 3; + } - return (width - 16) / 4; + return -EINVAL; } -static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width) +static int sun8i_i2s_get_sr_wss(unsigned int width) { - if (width % 4) - return -EINVAL; - - if (width < 8 || width > 32) - return -EINVAL; + switch (width) { + case 8: + return 1; + case 12: + return 2; + case 16: + return 3; + case 20: + return 4; + case 24: + return 5; + case 28: + return 6; + case 32: + return 7; + } - return (width - 8) / 4 + 1; + return -EINVAL; } static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, @@ -574,11 +593,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, } i2s->playback_dma_data.addr_width = width; - sr = i2s->variant->get_sr(i2s, word_size); + sr = i2s->variant->get_sr(word_size); if (sr < 0) return -EINVAL; - wss = i2s->variant->get_wss(i2s, slot_width); + wss = i2s->variant->get_wss(slot_width); if (wss < 0) return -EINVAL; -- 2.25.1