From nobody Wed Apr 1 09:47:06 2026 Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (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 F31EF282F15; Tue, 31 Mar 2026 15:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971328; cv=pass; b=pDMHv/rTl4/rRLsmVfoBSExguFWu4XK5VqZQfkXfQPjj89Ine9t3SXPfkX5D/jlt/4NDOZUxv4jD9TEg+xbV438797lQCCCYPzczCQEIRYnwoP/C+9QWaKMVl7l9HyDaFDx5LJsZCKPw44qP0cOeLnFIlIMZfcCCpj7kQ5lCVEk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971328; c=relaxed/simple; bh=SiRbiPWfYoyb0jTLmTJ5QkjcEHFy0rmkUwIml/hwNNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W73PtCpkt3+ZjqzK6pPhWKbHCqEPGMIqLXbOKBicZLNHPquurD3PSHH96R9O7kA7qzaFaPCOLqIdLODGZtIU3GhFBwkDunpw0BcebTFRBjI5DtMvTIZXIWWmyRdXu2vygM8KCX8mE3xfV4cwc8ug783r90x2tzXbHvEgueAzrAM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net; spf=pass smtp.mailfrom=harin.net; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b=FLIBlmxF; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=harin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b="FLIBlmxF" ARC-Seal: i=1; a=rsa-sha256; t=1774971317; cv=none; d=zohomail.com; s=zohoarc; b=oEr0+M8HarrMKeI0UGX/O8xYdD0AuwYplSFm0+8CB2WGVcPSYxbSjTKKW7wCT2bTZ9N+eue1Ou6mT2NqrfiQRfGORYsQylEKu14GR1uNxjtyXq4++SXKRhgXCmJ24zPoIBs21okSUN6VhhYWIogfzY66mKLySwpW6fLLHb0AULk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774971317; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=1JidNBtwAKBiT/v7llcjGcbi5Vo8bK7rbL3FsDQVoxE=; b=LaI1WDqgdhTtrc4yLN3PKc0UmYrcpmqTXSpDJHfuBngoKg5CnfAZBODF2AHf4WsQf5LfpbFGcuans10T2T9LNSf1VJL9X3AHm59D8Y/d24NVpV8piw1wYn5SoxbLsJoXzgVanmnV9ml1DZq3xrgLXd2szHQogZOg4el5SLBu1Qw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=harin.net; spf=pass smtp.mailfrom=me@harin.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1774971317; s=zmail; d=harin.net; i=me@harin.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=1JidNBtwAKBiT/v7llcjGcbi5Vo8bK7rbL3FsDQVoxE=; b=FLIBlmxF1e+1TC4z9Kq6SZ7L5iP/dyY3L9qW03hl0CEJPkHsiR32BVldlY4TELuP EnmOF8b+Kril8v9Bx9fqTaJOu/A59ZdEJLtB7ibs5oAm8NzkTEPld9D2AGjZpm9bi85 upXORJ5oJRItU5WagJqYRJfoK9H/cIf68eb/eaUYckWaj6NzJJtdoVeE4ggMzVnMsqE fyHzLup+wWmeXqoTIUaQWGeFwoTt5L+Ut3pyoaVZ0cwmuE+dGmBejdQyR3wTgjG1KLK LbOlGwbWIAVqWZijS4JZa1T61IK5TMDJ5KC8a2WqitJe4iHb+vxzts539A8TfnnDFkL gxrbqxfFVA== Received: by mx.zohomail.com with SMTPS id 1774971315103279.22817137290644; Tue, 31 Mar 2026 08:35:15 -0700 (PDT) From: Harin Lee To: Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Harin Lee Subject: [PATCH 1/3] ALSA: ctxfi: Rename SPDIFI1 to SPDIFI_BAY Date: Wed, 1 Apr 2026 00:35:05 +0900 Message-ID: <20260331153507.2934795-2-me@harin.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331153507.2934795-1-me@harin.net> References: <20260331153507.2934795-1-me@harin.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Rename the SPDIFI1 enum value to SPDIFI_BAY to better reflect its purpose as the S/PDIF input on the internal drive bay, as opposed to the S/PDIF input via Flexijack or optical (SPDIFIO; not SPDIFI-zero). Signed-off-by: Harin Lee --- sound/pci/ctxfi/ctatc.c | 4 ++-- sound/pci/ctxfi/ctdaio.c | 6 +++--- sound/pci/ctxfi/ctdaio.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index da2667cb2489..9e0532fb33ff 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1429,10 +1429,10 @@ static int atc_get_resources(struct ct_atc *atc) for (i =3D 0; i < NUM_DAIOTYP; i++) { if (((i =3D=3D MIC) && !cap.dedicated_mic) || ((i =3D=3D RCA) && !cap.dedicated_rca) || - i =3D=3D SPDIFI1) + i =3D=3D SPDIFI_BAY) continue; if (atc->model =3D=3D CTSB073X && i =3D=3D SPDIFIO) - da_desc.type =3D SPDIFI1; + da_desc.type =3D SPDIFI_BAY; else da_desc.type =3D i; da_desc.output =3D (i < LINEIM) || (i =3D=3D RCA); diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 4dbb1dd7af32..128cf2f69ac1 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -35,7 +35,7 @@ static const struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = =3D { [LINEIM] =3D {.left =3D 0x1b5, .right =3D 0x1bd}, [SPDIFOO] =3D {.left =3D 0x20, .right =3D 0x21}, [SPDIFIO] =3D {.left =3D 0x15, .right =3D 0x1d}, - [SPDIFI1] =3D {.left =3D 0x95, .right =3D 0x9d}, + [SPDIFI_BAY] =3D {.left =3D 0x95, .right =3D 0x9d}, }; =20 static const struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] =3D { @@ -106,7 +106,7 @@ static int daio_device_index(enum DAIOTYP type, struct = hw *hw) switch (type) { case SPDIFOO: return 0; case SPDIFIO: return 0; - case SPDIFI1: return 1; + case SPDIFI_BAY: return 1; case LINEO1: return 4; case LINEO2: return 7; case LINEO3: return 5; @@ -120,7 +120,7 @@ static int daio_device_index(enum DAIOTYP type, struct = hw *hw) switch (type) { case SPDIFOO: return 0; case SPDIFIO: return 0; - case SPDIFI1: return 1; + case SPDIFI_BAY: return 1; case LINEO1: return 4; case LINEO2: return 7; case LINEO3: return 5; diff --git a/sound/pci/ctxfi/ctdaio.h b/sound/pci/ctxfi/ctdaio.h index ff77d55539a5..c9f6207fe92f 100644 --- a/sound/pci/ctxfi/ctdaio.h +++ b/sound/pci/ctxfi/ctdaio.h @@ -32,7 +32,7 @@ enum DAIOTYP { SPDIFIO, /* S/PDIF In (Flexijack/Optical) on the card */ MIC, /* Dedicated mic on Titanium HD */ RCA, /* Dedicated RCA on SE-300PCIE */ - SPDIFI1, /* S/PDIF In on internal Drive Bay */ + SPDIFI_BAY, /* S/PDIF In on internal drive bay */ NUM_DAIOTYP }; =20 --=20 2.53.0 From nobody Wed Apr 1 09:47:06 2026 Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (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 E3F4D41B363; Tue, 31 Mar 2026 15:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971329; cv=pass; b=iWePCs6ZzyrddAqi5CPSW3vwXFXUoEz3LO3Ip5r3ZGI/fMEoYwl9f6kBGyLPncr1QR/GdXC402UWFZzz9d9rd1RlVklaQ8MT9cTXTqgVnf33LY6VB85xELuZcoZblbmChkY2C+7xk9yKI9HDa50cFG/uKIGepX+dQiYfA8kx/Fo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971329; c=relaxed/simple; bh=blYfoQdxlUno/QbkNsoSm2QGfoCKCdN7A66a23gd+Lg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eGMl5RD9j1BVTHaJjQbpHJi1PgYsfnBy2FAgTOpfvbVco5mcMydtFGxq5fnfFSsOxLzLArHyYL2V2/H4U2OdYEDs+V+QI58oJKPUnKVEvX1U445j2eXdz22KKGCwNUl+hN2HW/2uPbzUDQ5Qvc2YpD+A/LNcy8uiFI8oKsxJZh8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net; spf=pass smtp.mailfrom=harin.net; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b=IyJXXTMU; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=harin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b="IyJXXTMU" ARC-Seal: i=1; a=rsa-sha256; t=1774971319; cv=none; d=zohomail.com; s=zohoarc; b=l6ScYLfNzcpMfCt4wcCtRiQvLedHQfWvd6yNGFRLnpuV8NvDAqV0qTMa3ZObIUr599bvAJIlbAVzA5P80VNiDpWtyt4Awa8ef2tcfm1JKgzvGExM1hwciF0cgRqQbm3atWi40Go0O+2tcJnzIH6z3MBUxNWp5JsHgXQQos8TmlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774971319; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=6b88KTEvG3ODJv5UyR27GmEymxtjMI+nHspKrUwgo7s=; b=STk2rLZWksuOBt3ynU4rTy1S7VLlBZWcc64/zMIMwtLb+4zqSdALZnYpDnBTZBNa9XrDPRASd6DMMX/nWoexMwBiGWzSaUWodtF/zyWq0zqPkZhmzVV5cE1T4KTNG0rNiK8dnoR/88ZN0qm3khTcqKMrp9baqVOZxUOgq/L7o5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=harin.net; spf=pass smtp.mailfrom=me@harin.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1774971319; s=zmail; d=harin.net; i=me@harin.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=6b88KTEvG3ODJv5UyR27GmEymxtjMI+nHspKrUwgo7s=; b=IyJXXTMUrvIHlabdTTx7MOb01WHkmuR4YnqXleadnzvSeQu0y5dMN5NDlBiAT2s/ qjSK8j+eU2jjEqiqk6TJ01zMiG2ThOPBzyLulUGyMkh8c/+zaqlfTbkZYvfGZX9kSxi AkYKrA57Jc0Yar9Jq4gYsZHJhlV2THriOEHiils94AttSUhOjeMNJU+dkrjXL8ViTXb sJoBeXwM0TXC7ofdf2YNYupgDXZMuUYxgqUbKwgGzPINkcnQ7Gm6aq5jMSCcN55c0S+ penkRJcre/y5iU1YK8eMR9ecETmE5vIQCVnuU5y0Dl4gUCH5MlbVooLyUdlf2rZ856o 2DljNYIrlw== Received: by mx.zohomail.com with SMTPS id 1774971317223901.5307172316649; Tue, 31 Mar 2026 08:35:17 -0700 (PDT) From: Harin Lee To: Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Harin Lee Subject: [PATCH 2/3] ALSA: ctxfi: Use matching DAIO type for da_desc Date: Wed, 1 Apr 2026 00:35:06 +0900 Message-ID: <20260331153507.2934795-3-me@harin.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331153507.2934795-1-me@harin.net> References: <20260331153507.2934795-1-me@harin.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Skip the unused DAIO type per model (SPDIFIO on CTSB073X, SPDIFI_BAY on all others) and use the matching DAIO type directly as da_desc type. This removes the mismatch between the actual DAIO resource and the da_desc type like SPDIFI_BAY (formerly SPDIFI1). Update related functions accordingly, and drop the unreachable SPDIFI_BAY case from the hw20k2 daio_device_index(). Signed-off-by: Harin Lee --- sound/pci/ctxfi/ctatc.c | 17 ++++++++--------- sound/pci/ctxfi/ctdaio.c | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 9e0532fb33ff..9a1f6cebaa32 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1121,7 +1121,8 @@ static int atc_spdif_out_unmute(struct ct_atc *atc, u= nsigned char state) =20 static int atc_spdif_in_unmute(struct ct_atc *atc, unsigned char state) { - return atc_daio_unmute(atc, state, SPDIFIO); + return atc_daio_unmute(atc, state, (atc->model =3D=3D CTSB073X) ? + SPDIFI_BAY : SPDIFIO); } =20 static int atc_spdif_out_get_status(struct ct_atc *atc, unsigned int *stat= us) @@ -1429,12 +1430,9 @@ static int atc_get_resources(struct ct_atc *atc) for (i =3D 0; i < NUM_DAIOTYP; i++) { if (((i =3D=3D MIC) && !cap.dedicated_mic) || ((i =3D=3D RCA) && !cap.dedicated_rca) || - i =3D=3D SPDIFI_BAY) + (i =3D=3D ((atc->model =3D=3D CTSB073X) ? SPDIFIO : SPDIFI_BAY))) continue; - if (atc->model =3D=3D CTSB073X && i =3D=3D SPDIFIO) - da_desc.type =3D SPDIFI_BAY; - else - da_desc.type =3D i; + da_desc.type =3D i; da_desc.output =3D (i < LINEIM) || (i =3D=3D RCA); err =3D daio_mgr->get_daio(daio_mgr, &da_desc, (struct daio **)&atc->daios[i]); @@ -1569,10 +1567,11 @@ static void atc_connect_resources(struct ct_atc *at= c) mixer->set_input_right(mixer, MIX_MIC_IN, &src->rsc); } =20 - dai =3D container_of(atc->daios[SPDIFIO], struct dai, daio); + dai =3D container_of(atc->daios[(atc->model =3D=3D CTSB073X) ? + SPDIFI_BAY : SPDIFIO], struct dai, daio); atc_connect_dai(atc->rsc_mgrs[SRC], dai, - (struct src **)&atc->srcs[0], - (struct srcimp **)&atc->srcimps[0]); + (struct src **)&atc->srcs[0], + (struct srcimp **)&atc->srcimps[0]); =20 src =3D atc->srcs[0]; mixer->set_input_left(mixer, MIX_SPDIF_IN, &src->rsc); diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 128cf2f69ac1..69aacd06716c 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -120,7 +120,6 @@ static int daio_device_index(enum DAIOTYP type, struct = hw *hw) switch (type) { case SPDIFOO: return 0; case SPDIFIO: return 0; - case SPDIFI_BAY: return 1; case LINEO1: return 4; case LINEO2: return 7; case LINEO3: return 5; --=20 2.53.0 From nobody Wed Apr 1 09:47:06 2026 Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (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 1805641B372; Tue, 31 Mar 2026 15:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971329; cv=pass; b=uQCyhKF8nYseLmWSty/NYBdsToa4+MyaWu0lfAekH+uf3uUzfXpjE2F2EOvV7mU6PP3+A2ALq//Xv/DkcchqGOU29M4t4E0Y5W6sJBABcE4rbcYpYyhGU7aR31g/3ea2U+nGCZ3Mp0wc0k5Q6JeIkoYmo88G4uZ6xONxXbVgISw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971329; c=relaxed/simple; bh=H/tzLyCGZvJNjDWK/WsEO+l1aslwvu7+ObxIW6jdTZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nqoAs1WqJVRtQfslrlpSD65oswDwx7z1W401aS9FZwy00T3F6og1LvptmVBsL2eZdHE5jnu76rfEBmePjdC1DYYsD367M4K7KPELyITVi6AI1IQe7Nva/D2LtyVbjsV2TVf9bo5Qep1Koa60DU56QjkUugHoAGqhmVLbFg+1iz4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net; spf=pass smtp.mailfrom=harin.net; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b=CgueK7dC; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=harin.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=harin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=harin.net header.i=me@harin.net header.b="CgueK7dC" ARC-Seal: i=1; a=rsa-sha256; t=1774971321; cv=none; d=zohomail.com; s=zohoarc; b=Qs/SlOTiN8IGMsJs7z1SoGXpIarnKvjvF5dnTLFwQPUTGMXA4zbyAB75J4ZtGohTBwzMwoVkPf2FqKxEAOKUWAozq3symoULq2RKScUFCI/J7J/RSFqzm/Z3DinfNl9D1G4DLbBksTQVFbHWENZmWMfIEk4ytLI1k0eR7zCC+OU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774971321; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=W0dNABflnvy0nZZkH34907CQ+8F4GTV2BYhFEOA3oOQ=; b=ODthPPLjlSu6w03Smzt/ROKgcwIQ2s5uN6kPSiwnuuzg4upbUq3Li8DWj/Apr6d4pIv+q6vjPFX2tUqqGqGhsUAhB0bXDa/iIFhF5xzeUcYZhtioHqQcNYbROpoRWalPpR2OKqWioCjURKkWmxg4x0TYIRLVInMeCw12q4X9AiQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=harin.net; spf=pass smtp.mailfrom=me@harin.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1774971321; s=zmail; d=harin.net; i=me@harin.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=W0dNABflnvy0nZZkH34907CQ+8F4GTV2BYhFEOA3oOQ=; b=CgueK7dCM8JzJXyfdooHa9CSebFkfeYgDTEUbp6caGXFYclXfV4VZgS9FY/uhOSA Efl8TLKCdza87+JieAbcP9jutCzw/gcEYLjFLd/YA7ivhUC97MxxRtLWjyyT8Nzm/9F 2k8vdsBx0gA//ORUj1hG2eTUUL2ifeuNgcq1xzbe2krFIwlWJfzuNjisAvSW3PmEwIC dWYHTb1FQpxaFb7fiR/UoTXDnmJceI1hnD8OPS7jztUCFbc9AQSTu8+aquaJ2VamAhd DrXsj7eyIoJHspjb+dZXz1a7uw1364L1z6HsInn3id/5fhWKn70NQgUzRGaTSCbJu1S NY+0ddmLvA== Received: by mx.zohomail.com with SMTPS id 1774971319393580.4959151433793; Tue, 31 Mar 2026 08:35:19 -0700 (PDT) From: Harin Lee To: Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Harin Lee Subject: [PATCH 3/3] ALSA: ctxfi: Precompute SRC allocation loop bound Date: Wed, 1 Apr 2026 00:35:07 +0900 Message-ID: <20260331153507.2934795-4-me@harin.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331153507.2934795-1-me@harin.net> References: <20260331153507.2934795-1-me@harin.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Replace the capability checks in the SRC and SRCIMP allocation loops with a precomputed loop bound. Cards with a dedicated mic input (SB1270, OK0010) allocate all NUM_ATC_SRCS entries, otherwise stop at 4. Signed-off-by: Harin Lee --- sound/pci/ctxfi/ctatc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 9a1f6cebaa32..d969b70431c9 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1405,9 +1405,11 @@ static int atc_get_resources(struct ct_atc *atc) struct sum_desc sum_dsc =3D {0}; struct sum_mgr *sum_mgr; struct capabilities cap; + int atc_srcs_limit; int err, i; =20 cap =3D atc->capabilities(atc); + atc_srcs_limit =3D cap.dedicated_mic ? NUM_ATC_SRCS : 4; =20 atc->daios =3D kcalloc(NUM_DAIOTYP, sizeof(void *), GFP_KERNEL); if (!atc->daios) @@ -1448,9 +1450,7 @@ static int atc_get_resources(struct ct_atc *atc) src_dsc.multi =3D 1; src_dsc.msr =3D atc->msr; src_dsc.mode =3D ARCRW; - for (i =3D 0; i < NUM_ATC_SRCS; i++) { - if (((i > 3) && !cap.dedicated_mic)) - continue; + for (i =3D 0; i < atc_srcs_limit; i++) { err =3D src_mgr->get_src(src_mgr, &src_dsc, (struct src **)&atc->srcs[i]); if (err) @@ -1459,9 +1459,7 @@ static int atc_get_resources(struct ct_atc *atc) =20 srcimp_mgr =3D atc->rsc_mgrs[SRCIMP]; srcimp_dsc.msr =3D 8; - for (i =3D 0; i < NUM_ATC_SRCS; i++) { - if (((i > 3) && !cap.dedicated_mic)) - continue; + for (i =3D 0; i < atc_srcs_limit; i++) { err =3D srcimp_mgr->get_srcimp(srcimp_mgr, &srcimp_dsc, (struct srcimp **)&atc->srcimps[i]); if (err) --=20 2.53.0