From patchwork Mon Dec 4 10:00:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 173185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2656512vqy; Mon, 4 Dec 2023 02:01:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuZORDYTPHNLQU02ZUZ2Xg9tL69DRS8QZtVvWv1hgvcCcg5fqJ5fx9l6/711JWj187rmkL X-Received: by 2002:a05:6a20:e595:b0:18b:d2d6:2f73 with SMTP id ng21-20020a056a20e59500b0018bd2d62f73mr3511143pzb.7.1701684067063; Mon, 04 Dec 2023 02:01:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701684067; cv=none; d=google.com; s=arc-20160816; b=VgydD23Pf8iBTLhWn7UfaXzSPwAwr985iaMrKINaIhkY4tl0eZsx3ibiJRc+6iXqFv i7i+hJ3WAf+EiMuQocLkWMdu5r8h5MlVsP0tXBEVVWB03+SIJEyomH3cgWMH1KwStuer KWoXgneq8v9rXEd5XrK1UL7LcBBrAvUwPr+/lENrCWRRphDGWTzPVuNIekYAHiY55LAk zpanTbGjJ5ACHm2Y9refxc/QVNrEz6HCfFEV5uSHm4dSEIgEiJB4PA6lwSMgTt6mmGYX +vHIBeUTJ7o8FwNMynhHDb123of+fMDqqreqrAi+h9ezXvHSkCoHrvSDlPGK85ei8Egw XgTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ci3vPfK43+K4niO6uFBbC2o2Y2UUChnmCN7Lkz2+0dU=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=KuD3Jw1F+MpGnqo8MzNFAZnrC5uChSLtwCTaNqU7IfOxcoev+lUf7hH87IqMfxfUHK YLHjUoBoiTPhsGY2A72JhWDhqTlF4LfR35n/VxmRqDXCAVDrIfa76a86NKsd/NWfD6d8 F1EQnvneIBgdDrLTM9iRMlLlVPiJr8LcEy7c6VT2021I1hCkIz/uEwsWFVOhrtb9+LGA DmiAGQHfk7iYa2YZjy5SoCm7A8z5+8DobjxZn7f7U9cIDKfCxXZinMVFIBNFkxG37MPV kvtbDkXHixI5j7p+1208pP5RiuXHCR80AEVilX56hYC3ywBwizxOZTjVqiiix1dGAAeo xyZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rHbBN9lL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id j24-20020a63cf18000000b00584ca25959csi7818135pgg.540.2023.12.04.02.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 02:01:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rHbBN9lL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C4F4480937A3; Mon, 4 Dec 2023 02:01:01 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229921AbjLDKAv (ORCPT + 99 others); Mon, 4 Dec 2023 05:00:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbjLDKAu (ORCPT ); Mon, 4 Dec 2023 05:00:50 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 691C9E5 for ; Mon, 4 Dec 2023 02:00:55 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a1975fe7befso438033666b.2 for ; Mon, 04 Dec 2023 02:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701684054; x=1702288854; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ci3vPfK43+K4niO6uFBbC2o2Y2UUChnmCN7Lkz2+0dU=; b=rHbBN9lLXSLbv+2gC4JFRHmM8dJ1gVYjataw2jQLl+NFrTwfdjJqEte0QL7pJzOdZx tTGIvmnVQt+beRS/ZLd8x0spHXlkb2TuWn5+pVUirxSbOznhREopS5CdfdAPK6G9NUbO vw7eH3u9Ol1ALsBDn3gruqCvaWZHz1gKlgxDtBT0IYduP2HxebFYbKFmS/x7XuNeeYiz wbTlHfNyqaeDlvH4oWnndTdhw1Wb29AMx01DFmOIGnd4oZGdLuvxTYtUOU48dKkepveX HfD2BDwzPz2lL/0Jy1NZasRJ8jhrPsoZi4kdsd9aTwsDm73wajX8rwNByMiJPxpcqIUa k5Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701684054; x=1702288854; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ci3vPfK43+K4niO6uFBbC2o2Y2UUChnmCN7Lkz2+0dU=; b=JKKyoYTPWpfpXDRutOk//M1KNk52W8r5PB/X/dnd1KSW8NV3Nz9lS8nvD6kUIB4mgT 22s1jiC4Gb3gU+XLZM5Os+SekTxUQEijLJSYMzIEM+1JszJfWApDOo9BA5FZIDFWkD95 xRCJqe1HGuSG2rsbyc2IvavNHfh+f0rTTH1COpM/fKnq/09soHlOQ9We/UIXMF7BI83U sxJ5C32I9/O8Lvcr4XZV9+gVkvve00uLSxelE+BgS6N+uv7g15VP3vK13tt1f2a5gNpR 59RsXNecK5fOn2R4Oea3m5g+0bvJ3E4uPe6srzjkxHyUvLG1QyKFtKH4fKn6mUffSUqQ fm0A== X-Gm-Message-State: AOJu0YxiKhG7IsAmm1tO+YmtLCE1weUMTNrDLBehbe6ns5Zx8qOsbvP2 7ql6DWJ98vzmzOTh1mfvleqgPg== X-Received: by 2002:a17:906:3f17:b0:9be:7b67:1674 with SMTP id c23-20020a1709063f1700b009be7b671674mr3140130ejj.3.1701684053242; Mon, 04 Dec 2023 02:00:53 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id z21-20020a170906715500b00a1185ad53c6sm5108123ejj.199.2023.12.04.02.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 02:00:52 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] ASoC: qcom: Fix trivial code style issues Date: Mon, 4 Dec 2023 11:00:48 +0100 Message-Id: <20231204100048.211800-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 04 Dec 2023 02:01:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784345072287308286 X-GMAIL-MSGID: 1784345072287308286 Fix few trivial code style issues, pointed out by checkpatch, so they do not get copied to new code (when old code is used as template): WARNING: Prefer "GPL" over "GPL v2" - see commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs. "GPL v2" bogosity") WARNING: function definition argument 'struct platform_device *' should also have an identifier name ERROR: code indent should use tabs where possible WARNING: please, no spaces at the start of a line WARNING: Missing a blank line after declarations WARNING: unnecessary whitespace before a quoted newline Signed-off-by: Krzysztof Kozlowski --- sound/soc/qcom/apq8016_sbc.c | 2 +- sound/soc/qcom/apq8096.c | 2 +- sound/soc/qcom/common.c | 2 +- sound/soc/qcom/lpass-apq8016.c | 2 +- sound/soc/qcom/lpass-cpu.c | 2 +- sound/soc/qcom/lpass-hdmi.c | 2 +- sound/soc/qcom/lpass-ipq806x.c | 2 +- sound/soc/qcom/lpass-platform.c | 2 +- sound/soc/qcom/lpass-sc7180.c | 2 +- sound/soc/qcom/lpass.h | 2 +- sound/soc/qcom/qdsp6/q6afe.c | 8 ++++---- sound/soc/qcom/qdsp6/q6apm-dai.c | 4 ++-- sound/soc/qcom/qdsp6/q6asm.h | 20 ++++++++++---------- sound/soc/qcom/qdsp6/topology.c | 3 ++- sound/soc/qcom/sc7180.c | 2 +- sound/soc/qcom/sc8280xp.c | 2 +- sound/soc/qcom/sdm845.c | 2 +- sound/soc/qcom/sdw.c | 2 +- sound/soc/qcom/sm8250.c | 2 +- sound/soc/qcom/storm.c | 2 +- 20 files changed, 34 insertions(+), 33 deletions(-) diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index efbdbb4dd753..4834a56eaa88 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -344,4 +344,4 @@ module_platform_driver(apq8016_sbc_platform_driver); MODULE_AUTHOR("Srinivas Kandagatla state = Q6APM_STREAM_STOPPED; break; case APM_CLIENT_EVENT_DATA_WRITE_DONE: - spin_lock_irqsave(&prtd->lock, flags); + spin_lock_irqsave(&prtd->lock, flags); prtd->pos += prtd->pcm_count; spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); @@ -143,7 +143,7 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo break; case APM_CLIENT_EVENT_DATA_READ_DONE: - spin_lock_irqsave(&prtd->lock, flags); + spin_lock_irqsave(&prtd->lock, flags); prtd->pos += prtd->pcm_count; spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h index 0103d8dae5da..519e1b3a3f7c 100644 --- a/sound/soc/qcom/qdsp6/q6asm.h +++ b/sound/soc/qcom/qdsp6/q6asm.h @@ -35,16 +35,16 @@ enum { #define ASM_LAST_BUFFER_FLAG BIT(30) struct q6asm_flac_cfg { - u32 sample_rate; - u32 ext_sample_rate; - u32 min_frame_size; - u32 max_frame_size; - u16 stream_info_present; - u16 min_blk_size; - u16 max_blk_size; - u16 ch_cfg; - u16 sample_size; - u16 md5_sum; + u32 sample_rate; + u32 ext_sample_rate; + u32 min_frame_size; + u32 max_frame_size; + u16 stream_info_present; + u16 min_blk_size; + u16 max_blk_size; + u16 ch_cfg; + u16 sample_size; + u16 md5_sum; }; struct q6asm_wma_cfg { diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c index 130b22a34fb3..70572c83e101 100644 --- a/sound/soc/qcom/qdsp6/topology.c +++ b/sound/soc/qcom/qdsp6/topology.c @@ -545,6 +545,7 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap if (mod) { int pn, id = 0; + mod->module_id = module_id; mod->max_ip_port = max_ip_port; mod->max_op_port = max_op_port; @@ -1271,7 +1272,7 @@ int audioreach_tplg_init(struct snd_soc_component *component) ret = request_firmware(&fw, tplg_fw_name, dev); if (ret < 0) { - dev_err(dev, "tplg firmware loading %s failed %d \n", tplg_fw_name, ret); + dev_err(dev, "tplg firmware loading %s failed %d\n", tplg_fw_name, ret); goto err; } diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index b0320a74d508..a15f385ede45 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -578,4 +578,4 @@ static struct platform_driver sc7180_snd_driver = { module_platform_driver(sc7180_snd_driver); MODULE_DESCRIPTION("sc7180 ASoC Machine Driver"); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 7c20b25ba3de..7c5a81681a2a 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -168,4 +168,4 @@ static struct platform_driver snd_sc8280xp_driver = { module_platform_driver(snd_sc8280xp_driver); MODULE_AUTHOR("Srinivas Kandagatla