From nobody Sat Jun 20 00:55:26 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 4339FC433F5 for ; Fri, 25 Mar 2022 20:58:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232458AbiCYVAB (ORCPT ); Fri, 25 Mar 2022 17:00:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232386AbiCYU75 (ORCPT ); Fri, 25 Mar 2022 16:59:57 -0400 X-Greylist: delayed 16729 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 25 Mar 2022 13:58:19 PDT Received: from 11.mo582.mail-out.ovh.net (11.mo582.mail-out.ovh.net [188.165.38.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63B4EE29F4 for ; Fri, 25 Mar 2022 13:58:18 -0700 (PDT) Received: from player797.ha.ovh.net (unknown [10.108.1.121]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 6591E24EAF for ; Fri, 25 Mar 2022 17:07:55 +0000 (UTC) Received: from sk2.org (82-65-25-201.subs.proxad.net [82.65.25.201]) (Authenticated sender: steve@sk2.org) by player797.ha.ovh.net (Postfix) with ESMTPSA id EA50424B7C4F9; Fri, 25 Mar 2022 17:07:46 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G0047b81cd7d-ade9-4cf8-ac91-229b08354cb4, 1702D5D0C6B5DF16716081994498F990499A02DA) smtp.auth=steve@sk2.org X-OVh-ClientIp: 82.65.25.201 From: Stephen Kitt To: James Schulman , David Rhodes , Lucas Tanure , Liam Girdwood , Mark Brown Cc: patches@opensource.cirrus.com, Wolfram Sang , linux-kernel@vger.kernel.org, Stephen Kitt Subject: [PATCH] ASoC: cs*: use simple i2c probe function Date: Fri, 25 Mar 2022 18:07:34 +0100 Message-Id: <20220325170734.1216018-1-steve@sk2.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 17792314756315121286 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvvddrudehuddgleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefuthgvphhhvghnucfmihhtthcuoehsthgvvhgvsehskhdvrdhorhhgqeenucggtffrrghtthgvrhhnpeetgedugfelkeeikeetgeegteevfeeufeetuefgudeiiedthfehtdeffeekvdeffeenucfkpheptddrtddrtddrtddpkedvrdeihedrvdehrddvtddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejleejrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepshhtvghvvgesshhkvddrohhrghdpnhgspghrtghpthhtohepuddprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrgh Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The i2c probe functions here don't use the id information provided in their second argument, so the single-parameter i2c probe function ("probe_new") can be used instead. This avoids scanning the identifier tables during probes. Signed-off-by: Stephen Kitt Acked-by: Charles Keepax Reviewed-by: Lucas Tanure Reviewed-by: Wolfram Sang --- sound/soc/codecs/cs35l32.c | 5 ++--- sound/soc/codecs/cs35l33.c | 5 ++--- sound/soc/codecs/cs35l34.c | 5 ++--- sound/soc/codecs/cs35l35.c | 5 ++--- sound/soc/codecs/cs35l36.c | 5 ++--- sound/soc/codecs/cs35l41-i2c.c | 5 ++--- sound/soc/codecs/cs4234.c | 4 ++-- sound/soc/codecs/cs4265.c | 5 ++--- sound/soc/codecs/cs4270.c | 5 ++--- sound/soc/codecs/cs4271-i2c.c | 5 ++--- sound/soc/codecs/cs42l42.c | 5 ++--- sound/soc/codecs/cs42l51-i2c.c | 5 ++--- sound/soc/codecs/cs42l52.c | 5 ++--- sound/soc/codecs/cs42l56.c | 5 ++--- sound/soc/codecs/cs42l73.c | 5 ++--- sound/soc/codecs/cs42xx8-i2c.c | 5 ++--- sound/soc/codecs/cs43130.c | 5 ++--- sound/soc/codecs/cs4341.c | 5 ++--- sound/soc/codecs/cs4349.c | 5 ++--- sound/soc/codecs/cs53l30.c | 5 ++--- 20 files changed, 40 insertions(+), 59 deletions(-) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index 933e3d627e5f..badfc55bc5fa 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -346,8 +346,7 @@ static int cs35l32_handle_of_data(struct i2c_client *i2= c_client, return 0; } =20 -static int cs35l32_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs35l32_i2c_probe(struct i2c_client *i2c_client) { struct cs35l32_private *cs35l32; struct cs35l32_platform_data *pdata =3D @@ -576,7 +575,7 @@ static struct i2c_driver cs35l32_i2c_driver =3D { .of_match_table =3D cs35l32_of_match, }, .id_table =3D cs35l32_id, - .probe =3D cs35l32_i2c_probe, + .probe_new =3D cs35l32_i2c_probe, .remove =3D cs35l32_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c index 2a6f5e46d031..47dc0f6d90a2 100644 --- a/sound/soc/codecs/cs35l33.c +++ b/sound/soc/codecs/cs35l33.c @@ -1116,8 +1116,7 @@ static int cs35l33_of_get_pdata(struct device *dev, return 0; } =20 -static int cs35l33_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs35l33_i2c_probe(struct i2c_client *i2c_client) { struct cs35l33_private *cs35l33; struct cs35l33_pdata *pdata =3D dev_get_platdata(&i2c_client->dev); @@ -1286,7 +1285,7 @@ static struct i2c_driver cs35l33_i2c_driver =3D { =20 }, .id_table =3D cs35l33_id, - .probe =3D cs35l33_i2c_probe, + .probe_new =3D cs35l33_i2c_probe, .remove =3D cs35l33_i2c_remove, =20 }; diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c index ed678241c22b..50d509a06071 100644 --- a/sound/soc/codecs/cs35l34.c +++ b/sound/soc/codecs/cs35l34.c @@ -994,8 +994,7 @@ static const char * const cs35l34_core_supplies[] =3D { "VP", }; =20 -static int cs35l34_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs35l34_i2c_probe(struct i2c_client *i2c_client) { struct cs35l34_private *cs35l34; struct cs35l34_platform_data *pdata =3D @@ -1217,7 +1216,7 @@ static struct i2c_driver cs35l34_i2c_driver =3D { =20 }, .id_table =3D cs35l34_id, - .probe =3D cs35l34_i2c_probe, + .probe_new =3D cs35l34_i2c_probe, .remove =3D cs35l34_i2c_remove, =20 }; diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c index 961a3e07e70f..6b70afb70a67 100644 --- a/sound/soc/codecs/cs35l35.c +++ b/sound/soc/codecs/cs35l35.c @@ -1466,8 +1466,7 @@ static const struct reg_sequence cs35l35_errata_patch= [] =3D { { 0x7F, 0x00 }, }; =20 -static int cs35l35_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs35l35_i2c_probe(struct i2c_client *i2c_client) { struct cs35l35_private *cs35l35; struct device *dev =3D &i2c_client->dev; @@ -1658,7 +1657,7 @@ static struct i2c_driver cs35l35_i2c_driver =3D { .of_match_table =3D cs35l35_of_match, }, .id_table =3D cs35l35_id, - .probe =3D cs35l35_i2c_probe, + .probe_new =3D cs35l35_i2c_probe, .remove =3D cs35l35_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c index d83c1b318c1c..cc5e80222916 100644 --- a/sound/soc/codecs/cs35l36.c +++ b/sound/soc/codecs/cs35l36.c @@ -1700,8 +1700,7 @@ static const struct reg_sequence cs35l36_revb0_errata= _patch[] =3D { { CS35L36_TESTKEY_CTRL, CS35L36_TEST_LOCK2 }, }; =20 -static int cs35l36_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs35l36_i2c_probe(struct i2c_client *i2c_client) { struct cs35l36_private *cs35l36; struct device *dev =3D &i2c_client->dev; @@ -1947,7 +1946,7 @@ static struct i2c_driver cs35l36_i2c_driver =3D { .of_match_table =3D cs35l36_of_match, }, .id_table =3D cs35l36_id, - .probe =3D cs35l36_i2c_probe, + .probe_new =3D cs35l36_i2c_probe, .remove =3D cs35l36_i2c_remove, }; module_i2c_driver(cs35l36_i2c_driver); diff --git a/sound/soc/codecs/cs35l41-i2c.c b/sound/soc/codecs/cs35l41-i2c.c index faad5c638cb8..86d866aeb680 100644 --- a/sound/soc/codecs/cs35l41-i2c.c +++ b/sound/soc/codecs/cs35l41-i2c.c @@ -29,8 +29,7 @@ static const struct i2c_device_id cs35l41_id_i2c[] =3D { =20 MODULE_DEVICE_TABLE(i2c, cs35l41_id_i2c); =20 -static int cs35l41_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cs35l41_i2c_probe(struct i2c_client *client) { struct cs35l41_private *cs35l41; struct device *dev =3D &client->dev; @@ -91,7 +90,7 @@ static struct i2c_driver cs35l41_i2c_driver =3D { .acpi_match_table =3D ACPI_PTR(cs35l41_acpi_match), }, .id_table =3D cs35l41_id_i2c, - .probe =3D cs35l41_i2c_probe, + .probe_new =3D cs35l41_i2c_probe, .remove =3D cs35l41_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs4234.c b/sound/soc/codecs/cs4234.c index 20126cc675b1..b44939166e5d 100644 --- a/sound/soc/codecs/cs4234.c +++ b/sound/soc/codecs/cs4234.c @@ -731,7 +731,7 @@ static int cs4234_powerup(struct cs4234 *cs4234) return 0; } =20 -static int cs4234_i2c_probe(struct i2c_client *i2c_client, const struct i2= c_device_id *id) +static int cs4234_i2c_probe(struct i2c_client *i2c_client) { struct cs4234 *cs4234; struct device *dev =3D &i2c_client->dev; @@ -908,7 +908,7 @@ static struct i2c_driver cs4234_i2c_driver =3D { .pm =3D &cs4234_pm, .of_match_table =3D cs4234_of_match, }, - .probe =3D cs4234_i2c_probe, + .probe_new =3D cs4234_i2c_probe, .remove =3D cs4234_i2c_remove, }; module_i2c_driver(cs4234_i2c_driver); diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 4415fb364d4d..86bfa8d5ec78 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -568,8 +568,7 @@ static const struct regmap_config cs4265_regmap =3D { .cache_type =3D REGCACHE_RBTREE, }; =20 -static int cs4265_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs4265_i2c_probe(struct i2c_client *i2c_client) { struct cs4265_private *cs4265; int ret; @@ -653,7 +652,7 @@ static struct i2c_driver cs4265_i2c_driver =3D { .of_match_table =3D cs4265_of_match, }, .id_table =3D cs4265_id, - .probe =3D cs4265_i2c_probe, + .probe_new =3D cs4265_i2c_probe, .remove =3D cs4265_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 2d239e983a83..07cac01f87bd 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -677,8 +677,7 @@ static int cs4270_i2c_remove(struct i2c_client *i2c_cli= ent) * This function is called whenever the I2C subsystem finds a device that * matches the device ID given via a prior call to i2c_add_driver(). */ -static int cs4270_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs4270_i2c_probe(struct i2c_client *i2c_client) { struct cs4270_private *cs4270; unsigned int val; @@ -765,7 +764,7 @@ static struct i2c_driver cs4270_i2c_driver =3D { .of_match_table =3D cs4270_of_match, }, .id_table =3D cs4270_id, - .probe =3D cs4270_i2c_probe, + .probe_new =3D cs4270_i2c_probe, .remove =3D cs4270_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs4271-i2c.c b/sound/soc/codecs/cs4271-i2c.c index 0a174236f573..0e8a7cf0da50 100644 --- a/sound/soc/codecs/cs4271-i2c.c +++ b/sound/soc/codecs/cs4271-i2c.c @@ -11,8 +11,7 @@ #include #include "cs4271.h" =20 -static int cs4271_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cs4271_i2c_probe(struct i2c_client *client) { struct regmap_config config; =20 @@ -35,7 +34,7 @@ static struct i2c_driver cs4271_i2c_driver =3D { .name =3D "cs4271", .of_match_table =3D of_match_ptr(cs4271_dt_ids), }, - .probe =3D cs4271_i2c_probe, + .probe_new =3D cs4271_i2c_probe, .id_table =3D cs4271_i2c_id, }; module_i2c_driver(cs4271_i2c_driver); diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 43d98bdb5b5b..8019921f9cca 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -2040,8 +2040,7 @@ static int cs42l42_handle_device_data(struct device *= dev, return 0; } =20 -static int cs42l42_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs42l42_i2c_probe(struct i2c_client *i2c_client) { struct cs42l42_private *cs42l42; int ret, i, devid; @@ -2240,7 +2239,7 @@ static struct i2c_driver cs42l42_i2c_driver =3D { .acpi_match_table =3D ACPI_PTR(cs42l42_acpi_match), }, .id_table =3D cs42l42_id, - .probe =3D cs42l42_i2c_probe, + .probe_new =3D cs42l42_i2c_probe, .remove =3D cs42l42_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c index 70260e0a8f09..2dec18ae2918 100644 --- a/sound/soc/codecs/cs42l51-i2c.c +++ b/sound/soc/codecs/cs42l51-i2c.c @@ -19,8 +19,7 @@ static struct i2c_device_id cs42l51_i2c_id[] =3D { }; MODULE_DEVICE_TABLE(i2c, cs42l51_i2c_id); =20 -static int cs42l51_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int cs42l51_i2c_probe(struct i2c_client *i2c) { struct regmap_config config; =20 @@ -44,7 +43,7 @@ static struct i2c_driver cs42l51_i2c_driver =3D { .of_match_table =3D cs42l51_of_match, .pm =3D &cs42l51_pm_ops, }, - .probe =3D cs42l51_i2c_probe, + .probe_new =3D cs42l51_i2c_probe, .remove =3D cs42l51_i2c_remove, .id_table =3D cs42l51_i2c_id, }; diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 80161151b3f2..9b182b585be4 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -1086,8 +1086,7 @@ static const struct regmap_config cs42l52_regmap =3D { .cache_type =3D REGCACHE_RBTREE, }; =20 -static int cs42l52_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs42l52_i2c_probe(struct i2c_client *i2c_client) { struct cs42l52_private *cs42l52; struct cs42l52_platform_data *pdata =3D dev_get_platdata(&i2c_client->dev= ); @@ -1226,7 +1225,7 @@ static struct i2c_driver cs42l52_i2c_driver =3D { .of_match_table =3D cs42l52_of_match, }, .id_table =3D cs42l52_id, - .probe =3D cs42l52_i2c_probe, + .probe_new =3D cs42l52_i2c_probe, }; =20 module_i2c_driver(cs42l52_i2c_driver); diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 3cf8a0b4478c..2c4e09b43199 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -1167,8 +1167,7 @@ static int cs42l56_handle_of_data(struct i2c_client *= i2c_client, return 0; } =20 -static int cs42l56_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs42l56_i2c_probe(struct i2c_client *i2c_client) { struct cs42l56_private *cs42l56; struct cs42l56_platform_data *pdata =3D @@ -1350,7 +1349,7 @@ static struct i2c_driver cs42l56_i2c_driver =3D { .of_match_table =3D cs42l56_of_match, }, .id_table =3D cs42l56_id, - .probe =3D cs42l56_i2c_probe, + .probe_new =3D cs42l56_i2c_probe, .remove =3D cs42l56_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 018463f34e12..5a9166289f36 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1274,8 +1274,7 @@ static const struct regmap_config cs42l73_regmap =3D { .use_single_write =3D true, }; =20 -static int cs42l73_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cs42l73_i2c_probe(struct i2c_client *i2c_client) { struct cs42l73_private *cs42l73; struct cs42l73_platform_data *pdata =3D dev_get_platdata(&i2c_client->dev= ); @@ -1386,7 +1385,7 @@ static struct i2c_driver cs42l73_i2c_driver =3D { .of_match_table =3D cs42l73_of_match, }, .id_table =3D cs42l73_id, - .probe =3D cs42l73_i2c_probe, + .probe_new =3D cs42l73_i2c_probe, =20 }; =20 diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index 0214e3ab9da0..cb06a06d48b0 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -17,8 +17,7 @@ =20 #include "cs42xx8.h" =20 -static int cs42xx8_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int cs42xx8_i2c_probe(struct i2c_client *i2c) { int ret =3D cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config)); @@ -51,7 +50,7 @@ static struct i2c_driver cs42xx8_i2c_driver =3D { .pm =3D &cs42xx8_pm, .of_match_table =3D cs42xx8_of_match, }, - .probe =3D cs42xx8_i2c_probe, + .probe_new =3D cs42xx8_i2c_probe, .remove =3D cs42xx8_i2c_remove, .id_table =3D cs42xx8_i2c_id, }; diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index 44b20c1ef851..e38552a961ef 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -2418,8 +2418,7 @@ static int cs43130_handle_device_data(struct i2c_clie= nt *i2c_client, return 0; } =20 -static int cs43130_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cs43130_i2c_probe(struct i2c_client *client) { struct cs43130_private *cs43130; int ret; @@ -2702,7 +2701,7 @@ static struct i2c_driver cs43130_i2c_driver =3D { .pm =3D &cs43130_runtime_pm, }, .id_table =3D cs43130_i2c_id, - .probe =3D cs43130_i2c_probe, + .probe_new =3D cs43130_i2c_probe, .remove =3D cs43130_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs4341.c b/sound/soc/codecs/cs4341.c index 29d05e32d341..8ac043f1aae0 100644 --- a/sound/soc/codecs/cs4341.c +++ b/sound/soc/codecs/cs4341.c @@ -225,8 +225,7 @@ static int cs4341_probe(struct device *dev) } =20 #if IS_ENABLED(CONFIG_I2C) -static int cs4341_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int cs4341_i2c_probe(struct i2c_client *i2c) { struct cs4341_priv *cs4341; =20 @@ -260,7 +259,7 @@ static struct i2c_driver cs4341_i2c_driver =3D { .name =3D "cs4341-i2c", .of_match_table =3D of_match_ptr(cs4341_dt_ids), }, - .probe =3D cs4341_i2c_probe, + .probe_new =3D cs4341_i2c_probe, .id_table =3D cs4341_i2c_id, }; #endif diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index 786c69a8ec4a..4ec4bed9ee08 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -278,8 +278,7 @@ static const struct regmap_config cs4349_regmap =3D { .cache_type =3D REGCACHE_RBTREE, }; =20 -static int cs4349_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cs4349_i2c_probe(struct i2c_client *client) { struct cs4349_private *cs4349; int ret; @@ -382,7 +381,7 @@ static struct i2c_driver cs4349_i2c_driver =3D { .pm =3D &cs4349_runtime_pm, }, .id_table =3D cs4349_i2c_id, - .probe =3D cs4349_i2c_probe, + .probe_new =3D cs4349_i2c_probe, .remove =3D cs4349_i2c_remove, }; =20 diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c index f2087bd38dbc..703545273900 100644 --- a/sound/soc/codecs/cs53l30.c +++ b/sound/soc/codecs/cs53l30.c @@ -918,8 +918,7 @@ static struct regmap_config cs53l30_regmap =3D { .use_single_write =3D true, }; =20 -static int cs53l30_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cs53l30_i2c_probe(struct i2c_client *client) { const struct device_node *np =3D client->dev.of_node; struct device *dev =3D &client->dev; @@ -1125,7 +1124,7 @@ static struct i2c_driver cs53l30_i2c_driver =3D { .pm =3D &cs53l30_runtime_pm, }, .id_table =3D cs53l30_id, - .probe =3D cs53l30_i2c_probe, + .probe_new =3D cs53l30_i2c_probe, .remove =3D cs53l30_i2c_remove, }; =20 --=20 2.27.0