From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27C34175A79 for ; Mon, 11 May 2026 23:00:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778540447; cv=none; b=KLTEEOgGAo7wvJmwoKwoOCJQImL2xEIVHkP5fVcdmDzyzVwu1vCsSFlA3TILIqNpLnpTPxQ7nMVBRKFo+DpnVg4KmZcHQPAGKkyXTVN63qxBHZUdElj6hi5A/MPv/ttMG0sTGXirhhf24Kr4GOFkjLNJWgEuGFKl3Fm2HjlU7EA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778540447; c=relaxed/simple; bh=joz+wms3pUHg/C+Syij+XFMQqoLKDM6bsQGFGoWw5gk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GBJxCUBli9Y2NzopPUQZq/bRcUQiD94yHDf8EcguXhuM3g4yS9iy2TXtJ6yfp2A4puKoy7dpJEaPUbyzWCDsMFr9Qod2djdVJqxv7oTGNa79OCRTFI6zbI9FK6/fKK+11krafkpGe7qKN+mBMkLBzVJ/P+bttdTEHdr5atrBdFg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=r1w04MJE; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r1w04MJE" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-83945063f70so2616352b3a.0 for ; Mon, 11 May 2026 16:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778540445; x=1779145245; 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=Wk8VgK0lM+YhCfLjqnvtMsJ32QJ7ln+Af3MRsV8idH0=; b=r1w04MJEleMxQ2eqiqOyelqOATICPitiS84eGqp0q014JZgbkHD6jPCABrv8pNTB7V k8cpr3vomrmOFp1/9SfM5CzQObSHaosEc75+xpkC4Q1drhQ59c3jKH9XfsPuyRqEyliO HB4loY194OKZD2PgteXIbh6XPLI328yo9aW0c9acgVRVGXf2A1Y4zc+hs466VH4URtzg mjtGvNO5Gtt7GCx4JSa5H32olqdOxh2wgQ6vpvHApAgZWjMt7ofPFWXyrzUdlOlZnJ6p ewwhfM569l8JbxNjElLi6W/tP2zjO/7nb/e3ea20pO3e5gapmY16wndFpvi0bxZZInoG bQTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778540445; x=1779145245; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Wk8VgK0lM+YhCfLjqnvtMsJ32QJ7ln+Af3MRsV8idH0=; b=DbINu0dTicHFjTm0xmS1nLbpn62wkEiXssS5Oc8YkPFMwt/Iq7QWdRlA0zhR4jBo3v T5ebKvR9qZbmjwkc8MBkMdXt4O0xFm3C+JQp3BYdaCMpxtMOzMzU3602zJZhcGmW0Htr s9c8MbFNvWQXVPs5//wxSiVw6FA80Qn0f3kDQl9o5yjZvxhgWytk6OIiopULAaNAFmd2 HUQzvIrcaoBURU+shClzta53JkYpVwNPRNeJhJSOewisyS0ThvFLw4MsxZl+49/A3nOG h6WkKqEdfc0d61zAEZM0F5ruG5r5VJSGY1oD4ve8ilLL/YJF06M3d/bONCRAKA8eWBgM q5TQ== X-Forwarded-Encrypted: i=1; AFNElJ9Hcfn4jMwYS/qz6HNuZ5UrhKwkQQNR/thfH9tqq5XzXh20AkZyxSaTr9qPAHdt5HeXOy3/7/I1AjXXnZA=@vger.kernel.org X-Gm-Message-State: AOJu0YzAv76X0kfXZ4VbsGgwvwH+pRQT/r/Nha/ragQohx/YSmw7dYFj d7Vyrermpu/RfzkGrflC8xC62fOkh3DEzqK1WxfzkEULt38puZUaHG6M X-Gm-Gg: Acq92OEvmV8yFkJOqF0M11/UP3kmXAjQrutmzDBTtLD7ibsxrO10FA6AfG2j3sMQTE5 LoAKfYUgbd/qlGSIsvgFvtdCq3+/By1MIDlb5iSTGH5B6AWaJAN4ykWT2qjN9K52IbonU+SlRyt noQr5zqAdEq+6QacbyADUkrCfcHs7AFyeXajL2gn8GdeSQOcJV0wmAoyluZckAQTVo1/42hJIES i/k9LAkcf6zSG+9QVYLHq6gtxgQYonHbK2V2r/DpHGLR0ZGIy/kQelIxjoLMgJfIBe7aANYujLk sfNz9qEGteY5jK8Vx5NimOFJmBEAYoVhwLNFP8LdYCjMh9Q/jYZ3C8r4TS1cE2lp4Hg4yLOmA7q 9ub0UoaBEwO4vT0FSO1nF4CD2r24s4Vidvh0HV+2iN86qPf2/hOItaEiQYdZg7+fzSKZFhPWFO2 g5OcyuUPUmr73LSn57CzlIoWRgx4Rp6rdhxkgL45KWy20nmhzMIt2eFzX8AX+KYT/5kKuVYLeHj bLiMQ/wTQAWbM0UuU2pxJiBQ6C0koFAewA= X-Received: by 2002:a05:6a00:3692:b0:82f:7cb7:63c7 with SMTP id d2e1a72fcca58-83ee8321af5mr1040515b3a.11.1778540443897; Mon, 11 May 2026 16:00:43 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83967dbcfc0sm25987831b3a.42.2026.05.11.16.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 16:00:43 -0700 (PDT) From: Rosen Penev To: linux-sound@vger.kernel.org Cc: Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ALSA: ctxfi: Use flexible array for SRCIMP imappers Date: Mon, 11 May 2026 16:00:26 -0700 Message-ID: <20260511230026.28488-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Store the SRCIMP imapper entries in the SRCIMP resource allocation instead of allocating a separate array. This keeps the mapper table tied to the SRCIMP lifetime and removes the extra allocation and cleanup paths. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- sound/pci/ctxfi/ctsrc.c | 15 +-------------- sound/pci/ctxfi/ctsrc.h | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c index 326997bb885d..46dc1f509234 100644 --- a/sound/pci/ctxfi/ctsrc.c +++ b/sound/pci/ctxfi/ctsrc.c @@ -668,13 +668,6 @@ static int srcimp_rsc_init(struct srcimp *srcimp, if (err) return err; - /* Reserve memory for imapper nodes */ - srcimp->imappers = kzalloc_objs(struct imapper, desc->msr); - if (!srcimp->imappers) { - err = -ENOMEM; - goto error1; - } - /* Set srcimp specific operations */ srcimp->rsc.ops = &srcimp_basic_rsc_ops; srcimp->ops = &srcimp_ops; @@ -683,16 +676,10 @@ static int srcimp_rsc_init(struct srcimp *srcimp, srcimp->rsc.ops->master(&srcimp->rsc); return 0; - -error1: - rsc_uninit(&srcimp->rsc); - return err; } static int srcimp_rsc_uninit(struct srcimp *srcimp) { - kfree(srcimp->imappers); - srcimp->imappers = NULL; srcimp->ops = NULL; srcimp->mgr = NULL; rsc_uninit(&srcimp->rsc); @@ -711,7 +698,7 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr, *rsrcimp = NULL; /* Allocate mem for SRCIMP resource */ - srcimp = kzalloc(sizeof(*srcimp), GFP_KERNEL); + srcimp = kzalloc_flex(*srcimp, imappers, desc->msr); if (!srcimp) return -ENOMEM; diff --git a/sound/pci/ctxfi/ctsrc.h b/sound/pci/ctxfi/ctsrc.h index e6366cc6a7ae..7ba94adde920 100644 --- a/sound/pci/ctxfi/ctsrc.h +++ b/sound/pci/ctxfi/ctsrc.h @@ -103,10 +103,10 @@ struct srcimp_rsc_ops; struct srcimp { struct rsc rsc; unsigned char idx[8]; - struct imapper *imappers; unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */ struct srcimp_mgr *mgr; const struct srcimp_rsc_ops *ops; + struct imapper imappers[]; }; struct srcimp_rsc_ops { -- 2.54.0