From patchwork Mon Jun 12 07:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13275710 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7A926C7EE2E for ; Mon, 12 Jun 2023 07:10:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CD5FD823; Mon, 12 Jun 2023 09:09:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD5FD823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1686553845; bh=uG+Rz5OykdyyUm2fBqQxDeg/Pr8LncchsyBz2TQ6teA=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=R6ahoIimOpmYiA81zEuvUMpyKxdgGXJCp1SG77KFS2ElfRBfnj1HNx1UlZh2SMNnQ r6f3771JdXpOm5ZChe95htYdzVvBz31E4/V8wx1p6sqGj/VGcjogpIgP1h5MiW/R+6 NMvWY075S4PLvYOG0/Jqoihm/Hv6hM/omRE5xVog= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DEF58F8052E; Mon, 12 Jun 2023 09:09:28 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 69235F800BA; Mon, 12 Jun 2023 09:09:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 291C8F80149; Mon, 12 Jun 2023 09:06:47 +0200 (CEST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 11619F800BA for ; Mon, 12 Jun 2023 09:06:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 11619F800BA Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q8bd3-0008Cc-Sx; Mon, 12 Jun 2023 09:06:17 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q8bd0-006pe7-Rm; Mon, 12 Jun 2023 09:06:14 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q8bd0-00DQ8O-1m; Mon, 12 Jun 2023 09:06:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Liam Girdwood , Mark Brown Cc: James Schulman , David Rhodes , Lucas Tanure , Richard Fitzgerald , Lars-Peter Clausen , =?utf-8?q?Nuno_S=C3=A1?= , =?utf-8?q?Martin_Povi=C5=A1e?= =?utf-8?q?r?= , alsa-devel@alsa-project.org, patches@opensource.cirrus.com, kernel@pengutronix.de Subject: [PATCH] ASoC: Switch two more i2c drivers back to use .probe() Date: Mon, 12 Jun 2023 09:06:08 +0200 Message-Id: <20230612070608.836186-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1701; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=uG+Rz5OykdyyUm2fBqQxDeg/Pr8LncchsyBz2TQ6teA=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkhsPfL2jWX5FRHLgh7JhU0BLkefn/hDF+gUm7a 8lw9ltmJeOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZIbD3wAKCRCPgPtYfRL+ Tvr8B/9Kum/LjyUZDHX21e4Mx3AlVnDAcUOtawcwqx0pWdV6YHVCvn+T0dBSg6SIKeHyU5eDgpb 2M7slC6XvNDc+Xn0v5NXntSCLTnlARsymEPkBUFyCjhB/2uU9hCQXOxjaxrX4FI5TMJdxb+7Bfv kztnCNXb8YGiKD8EwW05VZgCYfbcas6IkUEM0c8Ka4hG6hs+QrqcjgH2r7eyt/5d++nH8Mzzo50 +3IgUifQu9M8V56X5ci0Mkae/i7tW/5LmgKQo5+KWe5CcMv44jA1gID2KBZHbYf34+z2K6JPm/t /QpRj9OCtwAscarqAG/nFd07Wp6ubtdRHqo44vJlGAnqZlzk X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: alsa-devel@alsa-project.org Message-ID-Hash: MPQIMXOVIO6E6CBK6AIPWVMZEJHWFON5 X-Message-ID-Hash: MPQIMXOVIO6E6CBK6AIPWVMZEJHWFON5 X-MailFrom: ukl@pengutronix.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The previous conversion back to .probe() applied in commit 9abcd24002bf ("ASoC: Switch i2c drivers back to use .probe()") was created based on v6.3. Since then two more drivers were added which need to be convert back in the same way before eventually .probe_new() can be dropped from struct i2c_driver. Signed-off-by: Uwe Kleine-König --- Hello, cs35l56 was already in v6.4-rc1, ssm3515 is only in next. This patch is based on 4ac690bbae02 ("ASoC: ssm3515: Add new amp driver") which is the oldest commit in next that has both drivers. Best regards Uwe sound/soc/codecs/cs35l56-i2c.c | 2 +- sound/soc/codecs/ssm3515.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 4ac690bbae02e26e36e133becd86babb657126ef diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c index 295caad26224..ed2a41943d97 100644 --- a/sound/soc/codecs/cs35l56-i2c.c +++ b/sound/soc/codecs/cs35l56-i2c.c @@ -68,7 +68,7 @@ static struct i2c_driver cs35l56_i2c_driver = { .pm = &cs35l56_pm_ops_i2c_spi, }, .id_table = cs35l56_id_i2c, - .probe_new = cs35l56_i2c_probe, + .probe = cs35l56_i2c_probe, .remove = cs35l56_i2c_remove, }; diff --git a/sound/soc/codecs/ssm3515.c b/sound/soc/codecs/ssm3515.c index 784e890031a4..008cb3eb5758 100644 --- a/sound/soc/codecs/ssm3515.c +++ b/sound/soc/codecs/ssm3515.c @@ -439,7 +439,7 @@ static struct i2c_driver ssm3515_i2c_driver = { .name = "ssm3515", .of_match_table = of_match_ptr(ssm3515_of_match), }, - .probe_new = ssm3515_i2c_probe, + .probe = ssm3515_i2c_probe, }; module_i2c_driver(ssm3515_i2c_driver);