From nobody Sun Feb 8 15:42:53 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99693C83F2C for ; Mon, 4 Sep 2023 09:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240511AbjIDJIM (ORCPT ); Mon, 4 Sep 2023 05:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbjIDJIL (ORCPT ); Mon, 4 Sep 2023 05:08:11 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 118AE184 for ; Mon, 4 Sep 2023 02:08:08 -0700 (PDT) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 38497aPW081031; Mon, 4 Sep 2023 04:07:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1693818456; bh=9gx+aJFgLOE/Uv47M7kjrLmMOCgce/x7+xPWpwyQB/4=; h=From:To:CC:Subject:Date; b=Q9O9aRy56K8yQDjYDSvsUEn+2/1vzrdiFncWXR2YkbdhSJUQDQlb1tXg5ZEx+Dvu9 NN91YeaK53pXphhaom1xdanB1WtmCc6Aza4BrQDRAIFr62qxVmg/8aGojcV/Oy8Jji hScoIWZWPnLZQmDQeJLNKWQLLl9rvZPyEFSMaFgo= Received: from DLEE106.ent.ti.com (dlee106.ent.ti.com [157.170.170.36]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 38497apN025364 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 Sep 2023 04:07:36 -0500 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 4 Sep 2023 04:07:35 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 4 Sep 2023 04:07:35 -0500 Received: from LT5CG31242FY.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 38497TNO115432; Mon, 4 Sep 2023 04:07:30 -0500 From: Shenghao Ding To: CC: , , , , , , <13916275206@139.com>, , , , , , , , , , , Shenghao Ding Subject: [PATCH v1] ALSA: hda/tas2781: Update tas2781 HDA driver Date: Mon, 4 Sep 2023 17:07:24 +0800 Message-ID: <20230904090725.1388-1-shenghao-ding@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Revert structure cs35l41_dev_name and redefine tas2781_generic_fixup. Signed-off-by: Shenghao Ding --- Changes in v1: - Redefine tas2781_generic_fixup, remove hid param - revert from scodec_dev_name back to cs35l41_dev_name, it is unnecessary for tas2781 --- sound/pci/hda/patch_realtek.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a07df6f929..c3e410152b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6745,7 +6745,7 @@ static void comp_generic_playback_hook(struct hda_pcm= _stream *hinfo, struct hda_ } } =20 -struct scodec_dev_name { +struct cs35l41_dev_name { const char *bus; const char *hid; int index; @@ -6754,7 +6754,7 @@ struct scodec_dev_name { /* match the device name in a slightly relaxed manner */ static int comp_match_cs35l41_dev_name(struct device *dev, void *data) { - struct scodec_dev_name *p =3D data; + struct cs35l41_dev_name *p =3D data; const char *d =3D dev_name(dev); int n =3D strlen(p->bus); char tmp[32]; @@ -6773,19 +6773,19 @@ static int comp_match_cs35l41_dev_name(struct devic= e *dev, void *data) static int comp_match_tas2781_dev_name(struct device *dev, void *data) { - struct scodec_dev_name *p =3D data; + const char *bus =3D data; const char *d =3D dev_name(dev); - int n =3D strlen(p->bus); + int n =3D strlen(bus); char tmp[32]; =20 /* check the bus name */ - if (strncmp(d, p->bus, n)) + if (strncmp(d, bus, n)) return 0; /* skip the bus number */ if (isdigit(d[n])) n++; /* the rest must be exact matching */ - snprintf(tmp, sizeof(tmp), "-%s:00", p->hid); + snprintf(tmp, sizeof(tmp), "-%s:00", "TIAS2781"); =20 return !strcmp(d + n, tmp); } @@ -6795,7 +6795,7 @@ static void cs35l41_generic_fixup(struct hda_codec *c= dc, int action, const char { struct device *dev =3D hda_codec_dev(cdc); struct alc_spec *spec =3D cdc->spec; - struct scodec_dev_name *rec; + struct cs35l41_dev_name *rec; int ret, i; =20 switch (action) { @@ -6824,24 +6824,17 @@ static void cs35l41_generic_fixup(struct hda_codec = *cdc, int action, const char } =20 static void tas2781_generic_fixup(struct hda_codec *cdc, int action, - const char *bus, const char *hid) + const char *bus) { struct device *dev =3D hda_codec_dev(cdc); struct alc_spec *spec =3D cdc->spec; - struct scodec_dev_name *rec; int ret; =20 switch (action) { case HDA_FIXUP_ACT_PRE_PROBE: - rec =3D devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL); - if (!rec) - return; - rec->bus =3D bus; - rec->hid =3D hid; - rec->index =3D 0; spec->comps[0].codec =3D cdc; component_match_add(dev, &spec->match, - comp_match_tas2781_dev_name, rec); + comp_match_tas2781_dev_name, (void *)bus); ret =3D component_master_add_with_match(dev, &comp_master_ops, spec->match); if (ret) @@ -6888,7 +6881,7 @@ static void alc287_fixup_legion_16ithg6_speakers(stru= ct hda_codec *cdc, const st static void tas2781_fixup_i2c(struct hda_codec *cdc, const struct hda_fixup *fix, int action) { - tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781"); + tas2781_generic_fixup(cdc, action, "i2c"); } =20 /* for alc295_fixup_hp_top_speakers */ --=20 2.34.1