From patchwork Tue Feb 13 10:10:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 200330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp439114dyb; Tue, 13 Feb 2024 02:12:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXpj28i5N2sCnr+G9wrzGW+DA5w13jIK3D5eVP4ol4UFM782mdzH2zljd4efuFiFGbxuz6+zOG7bZ9NVwNm5h38wLqoLw== X-Google-Smtp-Source: AGHT+IGLyRQlxmo/pFhl0uv+IHRGv+MgSWql6El7qf6safHlp1eNrZ8DzAkM5PGBq6cLuBZf2IIJ X-Received: by 2002:a05:6808:118c:b0:3bf:dd24:b64c with SMTP id j12-20020a056808118c00b003bfdd24b64cmr10954530oil.34.1707819139274; Tue, 13 Feb 2024 02:12:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707819139; cv=pass; d=google.com; s=arc-20160816; b=WOoQvrg3BnnEW+PGQdZZfbWLMmYyubjkjLesA07RtPlcqURmeHCMHNCgUj0jqp6XUo PSrl8U5Kk5tMh5bHXu40NWTioapPm+sd52ys5PyUSlBdxhQgHSteGSMxbYNkvWflQaJ9 88d/IPzPhZi2UnJHHKNDRKoXAO9cbj/zJlXfDQSpWVx2dg0B7+wn2luU4bOGgn+atzg6 0cF4rvlmwqabWY0dTSmtcrpz1MxRmt8sr3yaJAxK/APa5YkxyEKzKPMPYvvrJEHAZb0J wk0wDbYZEAzSjphHKs8gw6ZLADD7WA5cKoWNGV9hff6JD/m3hCTF65H95G5suhqAjUmU I8UA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=5/vMpuJZg8aS5DnQvZkhuNwqhaqkA+YlRxGj07T0QkA=; fh=RQ6CbnIDqECNVu7Z4Zg/hb1xqajlYmwvN2RtzmBdLK8=; b=rRMHDCNZJOQtFq+tFVPkeCfxlVWMAn/sOxIyI5kTrcdbjytqrvC5xd9zxO3/mBFCrd 7ll8ItYGvRnDxh5FqMmIuy5N3E6kjIQDgv/X58SFDh4gTQqwRkaZk7etDZ9+uO0UV6n/ HrGM7dX8rnmdd5b1//O6bPqxeF94kiMhNvY9XTvcoAP1C1/j+8zJPyIgbSBs2BEFvnv8 vA2pWcpqrQAs33F/q+3DKbrc+Nb9giK4FBEkxHHIboXVFkxMXhso+Fc9y1d3WfBziIuq 6t6/W4yVezMJsj++lNm/XB4vRIzaFDuy1E7eZioCpbAxbBKsAKu5PhcA//5v6FDGX/UQ rWcw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D0STckFO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-63314-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63314-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCV4jhn5WMjCtmSF8rzTn51WMTzP79SqSOqJ4U4WTZ6OOiC0zfXcrAJHRBAfnsPzbCjrUJ+OfIGQkrvr5Cf70PkEmw05WQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id i8-20020ac87648000000b0042c2f279597si2461480qtr.290.2024.02.13.02.12.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 02:12:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63314-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D0STckFO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-63314-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63314-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 344A71C2578D for ; Tue, 13 Feb 2024 10:11:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 038BD22626; Tue, 13 Feb 2024 10:11:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D0STckFO" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F243224DE; Tue, 13 Feb 2024 10:11:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707819073; cv=none; b=hkvjOoQzdmqFQfbBzO/f6B1iczmd9BobkUvXI4b9gL5mtbfCmBqH5wQA/iRF86pYEKiaZmD+1M9FtI0qN4HvHFMTqubBqWZ4jt/wyb6b2gPIyrfhLKeBgbT1rdcl+O0en6qK6f/YfZzuJERfXAItTjrRJohPJQi2GtZfC0X9BSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707819073; c=relaxed/simple; bh=mL4XO56Z6BWv4tMNoHpJYHvphFG+5pdC53wWnQvEb5Y=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=TyC92Z6l/lUTftSEMeVQTBEqb+5QWs5ClE8M2PyNCszMZfrOjdHfzCi8st5+F57lb18OKyg3oAK8td8HAyDKU4F8Q0t+/ho7DDQj79lzWK0m8uFtwcD34UNtemIYjYj1z2uGsVIHxpt8PhAHrL+YnhxAVRIp3DgyPfyLQhSVM+w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D0STckFO; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6125C433F1; Tue, 13 Feb 2024 10:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707819073; bh=mL4XO56Z6BWv4tMNoHpJYHvphFG+5pdC53wWnQvEb5Y=; h=From:To:Cc:Subject:Date:From; b=D0STckFOFxSAdd91J4HTYXokBfOyGak+23LmZrrtGV8AmqeeGqFOg7G9KY4zrdkQo 9fJbaRR9gKmH9eJ/i9WDck6tH3Lh0kNVuNI8I4TYDJZkvjsNAoifcmIfGk/P8DhvaQ F65xBXJ3N/cRhr40DhCUME0JWoxEXNRazJ1M8xnu3euc7YWesbTpIjVJ+WGkZOzu4R g67zJBv1Vz8uDDPz8oZhzsBl6dluwFkNVth8k+9Pz624uJAAvdN/dcHPLX/5aW565v GofS96pPXezVY6x1A5pS55CqTLqMEzRJoRCnAvkg218pRjmFS6UYizMDpd6kn1wbiA DaAlElGw6nIUg== From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Mohammad Rafi Shaik , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] ASoC: q6dsp: fix event handler prototype Date: Tue, 13 Feb 2024 11:10:46 +0100 Message-Id: <20240213101105.459402-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790778161624724527 X-GMAIL-MSGID: 1790778161624724527 From: Arnd Bergmann clang-16 points out a mismatch in function types that was hidden by a typecast: sound/soc/qcom/qdsp6/q6apm-dai.c:355:38: error: cast from 'void (*)(uint32_t, uint32_t, uint32_t *, void *)' (aka 'void (*)(unsigned int, unsigned int, unsigned int *, void *)') to 'q6apm_cb' (aka 'void (*)(unsigned int, unsigned int, void *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] 355 | prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler, prtd, graph_id); sound/soc/qcom/qdsp6/q6apm-dai.c:499:38: error: cast from 'void (*)(uint32_t, uint32_t, uint32_t *, void *)' (aka 'void (*)(unsigned int, unsigned int, unsigned int *, void *)') to 'q6apm_cb' (aka 'void (*)(unsigned int, unsigned int, void *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] 499 | prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler_compr, prtd, graph_id); The only difference here is the 'payload' argument, which is not even used in this function, so just fix its type and remove the cast. Fixes: 88b60bf047fd ("ASoC: q6dsp: q6apm-dai: Add open/free compress DAI callbacks") Signed-off-by: Arnd Bergmann --- sound/soc/qcom/qdsp6/q6apm-dai.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index 052e40cb38fe..00bbd291be5c 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -123,7 +123,7 @@ static struct snd_pcm_hardware q6apm_dai_hardware_playback = { .fifo_size = 0, }; -static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, void *priv) +static void event_handler(uint32_t opcode, uint32_t token, void *payload, void *priv) { struct q6apm_dai_rtd *prtd = priv; struct snd_pcm_substream *substream = prtd->substream; @@ -157,7 +157,7 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo } static void event_handler_compr(uint32_t opcode, uint32_t token, - uint32_t *payload, void *priv) + void *payload, void *priv) { struct q6apm_dai_rtd *prtd = priv; struct snd_compr_stream *substream = prtd->cstream; @@ -352,7 +352,7 @@ static int q6apm_dai_open(struct snd_soc_component *component, spin_lock_init(&prtd->lock); prtd->substream = substream; - prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler, prtd, graph_id); + prtd->graph = q6apm_graph_open(dev, event_handler, prtd, graph_id); if (IS_ERR(prtd->graph)) { dev_err(dev, "%s: Could not allocate memory\n", __func__); ret = PTR_ERR(prtd->graph); @@ -496,7 +496,7 @@ static int q6apm_dai_compr_open(struct snd_soc_component *component, return -ENOMEM; prtd->cstream = stream; - prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler_compr, prtd, graph_id); + prtd->graph = q6apm_graph_open(dev, event_handler_compr, prtd, graph_id); if (IS_ERR(prtd->graph)) { ret = PTR_ERR(prtd->graph); kfree(prtd);