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 6F580C433EF for ; Fri, 25 Mar 2022 16:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376974AbiCYQu2 (ORCPT ); Fri, 25 Mar 2022 12:50:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376956AbiCYQu0 (ORCPT ); Fri, 25 Mar 2022 12:50:26 -0400 X-Greylist: delayed 345 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 25 Mar 2022 09:48:51 PDT Received: from 19.mo582.mail-out.ovh.net (19.mo582.mail-out.ovh.net [188.165.56.177]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12391515AD for ; Fri, 25 Mar 2022 09:48:50 -0700 (PDT) Received: from player761.ha.ovh.net (unknown [10.110.103.115]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id EA78822EBE for ; Fri, 25 Mar 2022 16:48:48 +0000 (UTC) Received: from sk2.org (82-65-25-201.subs.proxad.net [82.65.25.201]) (Authenticated sender: steve@sk2.org) by player761.ha.ovh.net (Postfix) with ESMTPSA id 82CB728CE20A0; Fri, 25 Mar 2022 16:48:42 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-96R001a2f62d42-041c-440c-a3cb-cab1ba91dce3, BADA89D67C65793922B9C036380C8ED9CA508D09) smtp.auth=steve@sk2.org X-OVh-ClientIp: 82.65.25.201 From: Stephen Kitt To: Lars-Peter Clausen , =?UTF-8?q?Nuno=20S=C3=A1?= , Liam Girdwood , Mark Brown Cc: Wolfram Sang , linux-kernel@vger.kernel.org, Stephen Kitt Subject: [PATCH] ASoC: ada*, ssm*: use simple i2c probe function Date: Fri, 25 Mar 2022 17:48:28 +0100 Message-Id: <20220325164828.1209201-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: 17469462957791151750 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvvddrudehuddgleegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefuthgvphhhvghnucfmihhtthcuoehsthgvvhgvsehskhdvrdhorhhgqeenucggtffrrghtthgvrhhnpeetgedugfelkeeikeetgeegteevfeeufeetuefgudeiiedthfehtdeffeekvdeffeenucfkpheptddrtddrtddrtddpkedvrdeihedrvdehrddvtddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejiedurdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepshhtvghvvgesshhkvddrohhrghdpnhgspghrtghpthhtohepuddprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrgh 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 Reviewed-by: Nuno S=C3=A1 Reviewed-by: Wolfram Sang --- sound/soc/codecs/adau1372-i2c.c | 4 ++-- sound/soc/codecs/adau1373.c | 5 ++--- sound/soc/codecs/adau1701.c | 5 ++--- sound/soc/codecs/adau7118-i2c.c | 5 ++--- sound/soc/codecs/adav803.c | 5 ++--- sound/soc/codecs/ssm2518.c | 5 ++--- sound/soc/codecs/ssm4567.c | 5 ++--- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/adau1372-i2c.c b/sound/soc/codecs/adau1372-i2= c.c index fc87a76ff1ee..8ed0ffdedbc9 100644 --- a/sound/soc/codecs/adau1372-i2c.c +++ b/sound/soc/codecs/adau1372-i2c.c @@ -14,7 +14,7 @@ =20 #include "adau1372.h" =20 -static int adau1372_i2c_probe(struct i2c_client *client, const struct i2c_= device_id *id) +static int adau1372_i2c_probe(struct i2c_client *client) { return adau1372_probe(&client->dev, devm_regmap_init_i2c(client, &adau1372_regmap_config), NULL); @@ -30,7 +30,7 @@ static struct i2c_driver adau1372_i2c_driver =3D { .driver =3D { .name =3D "adau1372", }, - .probe =3D adau1372_i2c_probe, + .probe_new =3D adau1372_i2c_probe, .id_table =3D adau1372_i2c_ids, }; module_i2c_driver(adau1372_i2c_driver); diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 46128aaceae9..a9032b5c8d78 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c @@ -1473,8 +1473,7 @@ static const struct snd_soc_component_driver adau1373= _component_driver =3D { .non_legacy_dai_naming =3D 1, }; =20 -static int adau1373_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adau1373_i2c_probe(struct i2c_client *client) { struct adau1373 *adau1373; int ret; @@ -1508,7 +1507,7 @@ static struct i2c_driver adau1373_i2c_driver =3D { .driver =3D { .name =3D "adau1373", }, - .probe =3D adau1373_i2c_probe, + .probe_new =3D adau1373_i2c_probe, .id_table =3D adau1373_i2c_id, }; =20 diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index dba9af753188..98768e5300f0 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -785,8 +785,7 @@ static const struct regmap_config adau1701_regmap =3D { .reg_read =3D adau1701_reg_read, }; =20 -static int adau1701_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adau1701_i2c_probe(struct i2c_client *client) { struct adau1701 *adau1701; struct device *dev =3D &client->dev; @@ -878,7 +877,7 @@ static struct i2c_driver adau1701_i2c_driver =3D { .name =3D "adau1701", .of_match_table =3D of_match_ptr(adau1701_dt_ids), }, - .probe =3D adau1701_i2c_probe, + .probe_new =3D adau1701_i2c_probe, .id_table =3D adau1701_i2c_id, }; =20 diff --git a/sound/soc/codecs/adau7118-i2c.c b/sound/soc/codecs/adau7118-i2= c.c index aa7afb3b826d..afed48401b25 100644 --- a/sound/soc/codecs/adau7118-i2c.c +++ b/sound/soc/codecs/adau7118-i2c.c @@ -48,8 +48,7 @@ static const struct regmap_config adau7118_regmap_config = =3D { .volatile_reg =3D adau7118_volatile, }; =20 -static int adau7118_probe_i2c(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int adau7118_probe_i2c(struct i2c_client *i2c) { struct regmap *map; =20 @@ -79,7 +78,7 @@ static struct i2c_driver adau7118_driver =3D { .name =3D "adau7118", .of_match_table =3D adau7118_of_match, }, - .probe =3D adau7118_probe_i2c, + .probe_new =3D adau7118_probe_i2c, .id_table =3D adau7118_id, }; module_i2c_driver(adau7118_driver); diff --git a/sound/soc/codecs/adav803.c b/sound/soc/codecs/adav803.c index 0f565b851ea5..bf181bbaabed 100644 --- a/sound/soc/codecs/adav803.c +++ b/sound/soc/codecs/adav803.c @@ -19,8 +19,7 @@ static const struct i2c_device_id adav803_id[] =3D { }; MODULE_DEVICE_TABLE(i2c, adav803_id); =20 -static int adav803_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adav803_probe(struct i2c_client *client) { return adav80x_bus_probe(&client->dev, devm_regmap_init_i2c(client, &adav80x_regmap_config)); @@ -30,7 +29,7 @@ static struct i2c_driver adav803_driver =3D { .driver =3D { .name =3D "adav803", }, - .probe =3D adav803_probe, + .probe_new =3D adav803_probe, .id_table =3D adav803_id, }; module_i2c_driver(adav803_driver); diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 09449c6c4024..83acbdbb8e0d 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -735,8 +735,7 @@ static const struct regmap_config ssm2518_regmap_config= =3D { .num_reg_defaults =3D ARRAY_SIZE(ssm2518_reg_defaults), }; =20 -static int ssm2518_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int ssm2518_i2c_probe(struct i2c_client *i2c) { struct ssm2518_platform_data *pdata =3D i2c->dev.platform_data; struct ssm2518 *ssm2518; @@ -815,7 +814,7 @@ static struct i2c_driver ssm2518_driver =3D { .name =3D "ssm2518", .of_match_table =3D of_match_ptr(ssm2518_dt_ids), }, - .probe =3D ssm2518_i2c_probe, + .probe_new =3D ssm2518_i2c_probe, .id_table =3D ssm2518_i2c_ids, }; module_i2c_driver(ssm2518_driver); diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index 811b1a2c404a..08ced09ef001 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -444,8 +444,7 @@ static const struct regmap_config ssm4567_regmap_config= =3D { .num_reg_defaults =3D ARRAY_SIZE(ssm4567_reg_defaults), }; =20 -static int ssm4567_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int ssm4567_i2c_probe(struct i2c_client *i2c) { struct ssm4567 *ssm4567; int ret; @@ -502,7 +501,7 @@ static struct i2c_driver ssm4567_driver =3D { .of_match_table =3D of_match_ptr(ssm4567_of_match), .acpi_match_table =3D ACPI_PTR(ssm4567_acpi_match), }, - .probe =3D ssm4567_i2c_probe, + .probe_new =3D ssm4567_i2c_probe, .id_table =3D ssm4567_i2c_ids, }; module_i2c_driver(ssm4567_driver); --=20 2.27.0