From patchwork Thu May 25 20:36:40 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: 13255628 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 BB92EC77B7E for ; Thu, 25 May 2023 20:38:29 +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 960A5207; Thu, 25 May 2023 22:37:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 960A5207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1685047106; bh=XFldES2aPMwZZSw7UdtRfyJxjA5nYzer9ZVAMlZDwlo=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=CWW4PvPUoGkbNs+E+5TuQDDe+UmCGa+tUqtQSyat+LDrvBCBNRPxUaMNESscn5Gwt jGS5WwGa9lHTq+ysXobpR1iAr8IG6m8m0KLsspbEPMk2pceo+TUQUPny2cMmuLqKqt kkqKQFud4vl03py7cLgIRqeHtCjfJQzPaYh+gHuQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6DB4DF80544; Thu, 25 May 2023 22:37:27 +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 ADFFEF80249; Thu, 25 May 2023 22:37:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D49C4F80249; Thu, 25 May 2023 22:37:20 +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 99ABBF80053 for ; Thu, 25 May 2023 22:37:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 99ABBF80053 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 1q2HhZ-0005wd-86; Thu, 25 May 2023 22:36:49 +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 1q2HhS-002nnC-NR; Thu, 25 May 2023 22:36:42 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q2HhS-007xX3-1m; Thu, 25 May 2023 22:36:42 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jaroslav Kysela , Takashi Iwai Cc: Johannes Berg , James Schulman , David Rhodes , Lucas Tanure , Richard Fitzgerald , Wolfram Sang , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Dmitry Torokhov , Luca Ceresoli , Vladimir Oltean , Andy Shevchenko , Greg Kroah-Hartman , Sebastian Reichel , Adrien Grassein , Peter Senna Tschudin , Benjamin Mugnier , Corey Minyard , linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, kernel@pengutronix.de, patches@opensource.cirrus.com Subject: [PATCH] sound: Switch i2c drivers back to use .probe() Date: Thu, 25 May 2023 22:36:40 +0200 Message-Id: <20230525203640.677826-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=2359; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=XFldES2aPMwZZSw7UdtRfyJxjA5nYzer9ZVAMlZDwlo=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkb8bWfkjQ/JugH4K3qwzdQT+0sIkKIUX1sVLv4 PCm7XWM5HiJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZG/G1gAKCRCPgPtYfRL+ ThbxB/9kjwfTH5ux2APCpTMvB6ywkqXnkK/4PjlUX105jgWLthKoXF67qaJw1VdjeLrK3wibmSy 0hS/fU/6LogdKr+CMQrcRTBQg/npOJ97yETh5+ost6naqaJhl3Aa8+NEWEyU03MEmx3aC+TW+4/ 7bDzOa6RDaWCDl5seImwUsrPOLdDXN6z9td6XeeoXqmi5M3SJ8eYU/g6YEL2A0ibM/bq34s5aGD gjgjQPSLrwPnHgsRKiKMXwj0spyFeVaoKpVGX1wquWWcj0KDYnhPWHrEGHI5h4N6IlSD18Z6nIY bYdTkZfOOVv2+OZnIeAIDxUYLis7AYydX5Kh0Qpimn+QbyJ+ 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: J2ZTQAWVLFQ2Y2XVNXFZZWSTFUAAQO5K X-Message-ID-Hash: J2ZTQAWVLFQ2Y2XVNXFZZWSTFUAAQO5K 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: After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver. Signed-off-by: Uwe Kleine-König Reviewed-by: Luca Ceresoli --- sound/aoa/codecs/onyx.c | 2 +- sound/aoa/codecs/tas.c | 2 +- sound/pci/hda/cs35l41_hda_i2c.c | 2 +- sound/ppc/keywest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index 4c75381f5ab8..a8a59d71dcec 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -1048,7 +1048,7 @@ static struct i2c_driver onyx_driver = { .driver = { .name = "aoa_codec_onyx", }, - .probe_new = onyx_i2c_probe, + .probe = onyx_i2c_probe, .remove = onyx_i2c_remove, .id_table = onyx_i2c_id, }; diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c index f906e9aaddcf..ab1472390061 100644 --- a/sound/aoa/codecs/tas.c +++ b/sound/aoa/codecs/tas.c @@ -936,7 +936,7 @@ static struct i2c_driver tas_driver = { .driver = { .name = "aoa_codec_tas", }, - .probe_new = tas_i2c_probe, + .probe = tas_i2c_probe, .remove = tas_i2c_remove, .id_table = tas_i2c_id, }; diff --git a/sound/pci/hda/cs35l41_hda_i2c.c b/sound/pci/hda/cs35l41_hda_i2c.c index 7826b1a12d7d..b44536fbba17 100644 --- a/sound/pci/hda/cs35l41_hda_i2c.c +++ b/sound/pci/hda/cs35l41_hda_i2c.c @@ -58,7 +58,7 @@ static struct i2c_driver cs35l41_i2c_driver = { .pm = &cs35l41_hda_pm_ops, }, .id_table = cs35l41_hda_i2c_id, - .probe_new = cs35l41_hda_i2c_probe, + .probe = cs35l41_hda_i2c_probe, .remove = cs35l41_hda_i2c_remove, }; module_i2c_driver(cs35l41_i2c_driver); diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index 0c4f43963c75..dfc1fc9b701d 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -90,7 +90,7 @@ static struct i2c_driver keywest_driver = { .driver = { .name = "PMac Keywest Audio", }, - .probe_new = keywest_probe, + .probe = keywest_probe, .remove = keywest_remove, .id_table = keywest_i2c_id, };