From nobody Sun Apr 5 18:59:14 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 D8B50C6FA86 for ; Thu, 15 Sep 2022 09:46:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbiIOJqy (ORCPT ); Thu, 15 Sep 2022 05:46:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbiIOJpn (ORCPT ); Thu, 15 Sep 2022 05:45:43 -0400 Received: from hutie.ust.cz (hutie.ust.cz [185.8.165.127]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B180899B5C; Thu, 15 Sep 2022 02:45:40 -0700 (PDT) From: =?UTF-8?q?Martin=20Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1663235135; bh=QkNDCDx0U/aAsQx4/+vROBFRgvKACQCU9RfjxhOvKBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G6xgM0rrHVLyrNxwx9hnKCw0GjK7FUwtZ8nu229+b6GUs0uYBKnGLZ3gj9rI3PZLt V54934ZLw4MW4JxK4T/IA0vTQ5qE8ntu6LKxNWH00k7fbsVcoboLhpmniNY+htUAqn r44N+3xdMHvacdE3zaukF1x7P7YPEY+otdGf3PFE= To: James Schulman , David Rhodes , Lucas Tanure , Richard Fitzgerald , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , =?UTF-8?q?Martin=20Povi=C5=A1er?= Cc: Charles Keepax , ChiYuan Huang , Matt Flax , Lukas Bulwahn , Pierre-Louis Bossart , - , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev Subject: [PATCH v2 06/11] ASoC: cs42l42: Pass component and dai defs into common probe Date: Thu, 15 Sep 2022 11:44:39 +0200 Message-Id: <20220915094444.11434-7-povik+lin@cutebit.org> In-Reply-To: <20220915094444.11434-1-povik+lin@cutebit.org> References: <20220915094444.11434-1-povik+lin@cutebit.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Richard Fitzgerald Pass pointers to snd_soc_component_driver and snd_soc_dai_driver objects into cs42l42_common_probe(). This is in preparation for adding SoundWire support. Signed-off-by: Richard Fitzgerald Signed-off-by: Martin Povi=C5=A1er --- sound/soc/codecs/cs42l42.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 156d1b181cef..a4bb6f5d2267 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -579,7 +579,7 @@ static int cs42l42_set_jack(struct snd_soc_component *c= omponent, struct snd_soc_ return 0; } =20 -static const struct snd_soc_component_driver soc_component_dev_cs42l42 =3D= { +static const struct snd_soc_component_driver cs42l42_soc_component =3D { .set_jack =3D cs42l42_set_jack, .dapm_widgets =3D cs42l42_dapm_widgets, .num_dapm_widgets =3D ARRAY_SIZE(cs42l42_dapm_widgets), @@ -2219,7 +2219,9 @@ static int __maybe_unused cs42l42_i2c_resume(struct d= evice *dev) return 0; } =20 -static int cs42l42_common_probe(struct cs42l42_private *cs42l42) +static int cs42l42_common_probe(struct cs42l42_private *cs42l42, + const struct snd_soc_component_driver *component_drv, + struct snd_soc_dai_driver *dai) { int ret, i; =20 @@ -2275,9 +2277,7 @@ static int cs42l42_common_probe(struct cs42l42_privat= e *cs42l42) } =20 /* Register codec now so it can EPROBE_DEFER */ - ret =3D devm_snd_soc_register_component(cs42l42->dev, - &soc_component_dev_cs42l42, - &cs42l42_dai, 1); + ret =3D devm_snd_soc_register_component(cs42l42->dev, component_drv, dai,= 1); if (ret < 0) goto err; =20 @@ -2416,7 +2416,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_c= lient) cs42l42->regmap =3D regmap; cs42l42->irq =3D i2c_client->irq; =20 - ret =3D cs42l42_common_probe(cs42l42); + ret =3D cs42l42_common_probe(cs42l42, &cs42l42_soc_component, &cs42l42_da= i); if (ret) return ret; =20 --=20 2.33.0