From nobody Tue Sep 9 22:49:39 2025 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 DD602C61DA4 for ; Fri, 24 Feb 2023 12:06:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229900AbjBXMGT (ORCPT ); Fri, 24 Feb 2023 07:06:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbjBXMGR (ORCPT ); Fri, 24 Feb 2023 07:06:17 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 498EC65336 for ; Fri, 24 Feb 2023 04:06:16 -0800 (PST) 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 1pVWq3-0000cO-GQ; Fri, 24 Feb 2023 13:06:11 +0100 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 1pVWq1-007Aze-Ft; Fri, 24 Feb 2023 13:06:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq1-006EYk-GX; Fri, 24 Feb 2023 13:06:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH 1/9] misc: ad525x_dpot-i2c: Convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:52 +0100 Message-Id: <20230224120600.1681685-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1292; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=mZMy4fIoX9VoX671/ujh3l6dvR2sZ0vFBfJ5QYZaI/k=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgGWYZ8keqte4NLP53S5uCaMlHf1ql5crSHa pOrSxDbA+KJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioBgAKCRDB/BR4rcrs CX6MCACDJMLcVlwPFqphiqcsaBpcTjlkPiqn53IelowpPzNxMasMAbZ9xaSQGdfNW7wajIfoThu ijkwGZi3dY26Szqrsf878I+U27c/lYrgrQV0PFRo1saSk1v2fHWczfjc/zQh2KPaokJ4Oiqe+I5 gVo+X+ZCH7sgGmxOrMLIUJJ+jcez/aLDQn0DT270iinI6loLbU2jdUA3OHHkcLGkjCZ6UDiWy8X C4XIatL9rz+rFHtfxc3chUe8W8DPUFWDCNuPbLp4KxsiQ7Osv2KSUJQjVlAQvyiT9E1AErFgM/5 1PzLHBN8mMKCbyud7y6k1KI0W+qjv1est8jwO8EGmqG805aZ X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Acked-by: Greg Kroah-Hartman Link: https://lore.kernel.org/lkml/20221118224540.619276-483-uwe@kleine-koe= nig.org Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/misc/ad525x_dpot-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c index 28ffb4377d98..3856d5c04c5f 100644 --- a/drivers/misc/ad525x_dpot-i2c.c +++ b/drivers/misc/ad525x_dpot-i2c.c @@ -50,9 +50,9 @@ static const struct ad_dpot_bus_ops bops =3D { .write_r8d16 =3D write_r8d16, }; =20 -static int ad_dpot_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ad_dpot_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id =3D i2c_client_get_device_id(client); struct ad_dpot_bus_data bdata =3D { .client =3D client, .bops =3D &bops, @@ -106,7 +106,7 @@ static struct i2c_driver ad_dpot_i2c_driver =3D { .driver =3D { .name =3D "ad_dpot", }, - .probe =3D ad_dpot_i2c_probe, + .probe_new =3D ad_dpot_i2c_probe, .remove =3D ad_dpot_i2c_remove, .id_table =3D ad_dpot_id, }; --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 EEC76C61DA3 for ; Fri, 24 Feb 2023 12:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbjBXMGp (ORCPT ); Fri, 24 Feb 2023 07:06:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229917AbjBXMG1 (ORCPT ); Fri, 24 Feb 2023 07:06:27 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3728658D1 for ; Fri, 24 Feb 2023 04:06:23 -0800 (PST) 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 1pVWq3-0000cN-Qq; Fri, 24 Feb 2023 13:06:11 +0100 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 1pVWq1-007AzY-87; Fri, 24 Feb 2023 13:06:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq1-006EYn-N4; Fri, 24 Feb 2023 13:06:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Ajay Gupta , Peter Senna Tschudin , Vladimir Oltean , Luca Ceresoli , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] mtd: maps: pismo: Convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:53 +0100 Message-Id: <20230224120600.1681685-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1138; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=/0eiJPqFeurijjpkwmurJqwpYiXoK4/V9TBQsEVUx4E=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgKBq230DjtR0OENDTBnqh3jGbv7HQJOiXLd 6y9xrOx10OJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioCgAKCRDB/BR4rcrs CY4XCACH57ZCK1Vw03Zvu0LsFkiwrHRc8kuPqK/hmjDx7CRhsyr4gxJ0xxXg7CJId36dbm1JTUt 6QWR789F/GDm8Ke3B/p+rJW56+JBqHvlevMucJ/8ufUbR9Q67xjEuH87WwsveZ7iG8/ovUdGcrr sgy3Q1yYjtkhxt39BvnHNHF91FhJdTT5fI91UIW4xHZKwKkjJdj0I9DpliGYGSELePaBm3h8kLo 7YlxhXiPBIvkJAvqRiG5/esKuqv0DXyqRt2UF42xR7hlbu5oHKZFRJ/XpRfCmkNS6m15CboT/Dg 7uxvImtjHzjPAXvCaAFFo6j3oGNqZE+TlK3mXL2fZA9KXnu9 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Acked-by: Richard Weinberger Link: https://lore.kernel.org/lkml/20221118224540.619276-497-uwe@kleine-koe= nig.org Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/mtd/maps/pismo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index 5fcefcd0baca..3e0fff3f129e 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c @@ -206,8 +206,7 @@ static void pismo_remove(struct i2c_client *client) kfree(pismo); } =20 -static int pismo_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pismo_probe(struct i2c_client *client) { struct pismo_pdata *pdata =3D client->dev.platform_data; struct pismo_eeprom eeprom; @@ -260,7 +259,7 @@ static struct i2c_driver pismo_driver =3D { .driver =3D { .name =3D "pismo", }, - .probe =3D pismo_probe, + .probe_new =3D pismo_probe, .remove =3D pismo_remove, .id_table =3D pismo_id, }; --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 C3CE4C61DA3 for ; Fri, 24 Feb 2023 12:06:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbjBXMG2 (ORCPT ); Fri, 24 Feb 2023 07:06:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbjBXMGU (ORCPT ); Fri, 24 Feb 2023 07:06:20 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE57E658CA for ; Fri, 24 Feb 2023 04:06:18 -0800 (PST) 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 1pVWq3-0000cP-GQ; Fri, 24 Feb 2023 13:06:11 +0100 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 1pVWq1-007Azd-Fh; Fri, 24 Feb 2023 13:06:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq1-006EYq-Vw; Fri, 24 Feb 2023 13:06:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/9] serial: sc16is7xx: Convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:54 +0100 Message-Id: <20230224120600.1681685-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1343; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=SyAwunV7rOOAWji/gEzYK8mQViHExwViHtm1Rqv0acA=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMST/WMHb1X2gbKvcdZ6VfKrZwUmzDjDdX5TFkF6Q9FNeY E5UhdaDTkZjFgZGLgZZMUWWuiItsQkSa/7blSzhhhnEygQyhYGLUwAmop/EwTAnxa/8CkvhjanN dor3v3iaKa1kyZx+S/lRp+4VrvP/O1xj763ze/SVLWv6TF+Fb4zL/q3oyFXLF9RdJKBS96/h2Ad TlofX1zRnzF1+okXL/4ZqSlFzXmqJ5q4YcSGjLwzC4utvPHdL3hP+ZoWbiPj55EOH1a9GGZc/eu Yzx7UoTMAv4rbR9LQJAd+ZFnSwtAVbbMo8HL7YYFdWBLdo+9Ugb/vw/2Ht2lpvwnKOuQavrrc7Z +lzzLDyh3insI/7sy3lcmf0+yWYL1Xe3mQpH8ckdjAvwyhrh2NTiGnu1c+x/EkPv/b9nG8vcvja 5Cjd95/kijnPKFlvb3j8ufPx92fKl7bIbTlaFyxXzSoDAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Reviewed-by: Greg Kroah-Hartman Link: https://lore.kernel.org/lkml/20221118224540.619276-572-uwe@kleine-koe= nig.org Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/tty/serial/sc16is7xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 39f92eb1e698..8412b25eac86 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1665,9 +1665,9 @@ MODULE_ALIAS("spi:sc16is7xx"); #endif =20 #ifdef CONFIG_SERIAL_SC16IS7XX_I2C -static int sc16is7xx_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int sc16is7xx_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id =3D i2c_client_get_device_id(i2c); const struct sc16is7xx_devtype *devtype; struct regmap *regmap; =20 @@ -1708,7 +1708,7 @@ static struct i2c_driver sc16is7xx_i2c_uart_driver = =3D { .name =3D SC16IS7XX_NAME, .of_match_table =3D sc16is7xx_dt_ids, }, - .probe =3D sc16is7xx_i2c_probe, + .probe_new =3D sc16is7xx_i2c_probe, .remove =3D sc16is7xx_i2c_remove, .id_table =3D sc16is7xx_i2c_id_table, }; --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 3F9A0C61DA4 for ; Fri, 24 Feb 2023 12:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbjBXMHB (ORCPT ); Fri, 24 Feb 2023 07:07:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbjBXMGl (ORCPT ); Fri, 24 Feb 2023 07:06:41 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1966D671DD for ; Fri, 24 Feb 2023 04:06:28 -0800 (PST) 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 1pVWq5-0000cQ-Pz; Fri, 24 Feb 2023 13:06:13 +0100 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 1pVWq1-007Azk-O1; Fri, 24 Feb 2023 13:06:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq2-006EYt-6D; Fri, 24 Feb 2023 13:06:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Evgeniy Polyakov , Crt Mori , Jonathan Cameron , Jean Delvare , Javier Martinez Canillas , linux-kernel@vger.kernel.org Subject: [PATCH 4/9] w1: ds2482: Convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:55 +0100 Message-Id: <20230224120600.1681685-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1058; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=BzuVYSfwpD9FqWmWpmQJWk/Mwl/NXFiGZ/5Qwvgx0mU=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgRdtkNQDNgWuRKmbrh+DXfQMjcTk/EPMyGp jfiN54UhIuJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioEQAKCRDB/BR4rcrs CdV+B/0aQU9cupvi0J/P9tYJ5xh//u+NoUyh700iUabvg00NxFprJPBgxFW/7Po26ZMc4WThhCv kyES+i34OGGzHEOKSJizsq+7ga1x0WRCbmAnMLLtroM8iojlWk7CR91ByP61Y+tCOXlXWK84o9Y DHxSTc+sGbJa2nHDlxl/3owHgwivqIZywAnHm2NzIjE3VgnQoBMsgfxVY44hvhemSqDl+RH0QTR apaT3dlDiEITXXcVaCi6tBaNWSp2lvXjlxQJaf9FJI7aCgEziK7k9rutBWWoOL3xkncU6xUl7gB 8zRyyMe3XZiqRJBGY0I4dlDzFxAHkT+7sGXK+FoN/w78Byz9 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Link: https://lore.kernel.org/lkml/20221118224540.619276-596-uwe@kleine-koe= nig.org Signed-off-by: Uwe Kleine-K=C3=B6nig Reviewed-by: Jean Delvare --- drivers/w1/masters/ds2482.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c index 62c44616d8a9..3d8b51316bef 100644 --- a/drivers/w1/masters/ds2482.c +++ b/drivers/w1/masters/ds2482.c @@ -442,8 +442,7 @@ static u8 ds2482_w1_set_pullup(void *data, int delay) } =20 =20 -static int ds2482_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds2482_probe(struct i2c_client *client) { struct ds2482_data *data; int err =3D -ENODEV; @@ -553,7 +552,7 @@ static struct i2c_driver ds2482_driver =3D { .driver =3D { .name =3D "ds2482", }, - .probe =3D ds2482_probe, + .probe_new =3D ds2482_probe, .remove =3D ds2482_remove, .id_table =3D ds2482_id, }; --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 3F145C64ED8 for ; Fri, 24 Feb 2023 12:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbjBXMGi (ORCPT ); Fri, 24 Feb 2023 07:06:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229956AbjBXMG1 (ORCPT ); Fri, 24 Feb 2023 07:06:27 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E287658C2 for ; Fri, 24 Feb 2023 04:06:21 -0800 (PST) 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 1pVWq5-0000ck-1X; Fri, 24 Feb 2023 13:06:13 +0100 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 1pVWq2-007Azs-7i; Fri, 24 Feb 2023 13:06:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq2-006EYx-Cv; Fri, 24 Feb 2023 13:06:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Shunqian Zheng , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Kieran Bingham Subject: [PATCH 5/9] media: i2c: ov5695: convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:56 +0100 Message-Id: <20230224120600.1681685-6-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1210; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=siu3f6h9Hr7VMftXLH9Of9pD9INClG+aVvJygDvAciI=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgUuVzzJQ/lgJA1HJTlVSb9jZ8IDBZxCv8zA ++zMYKFbPqJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioFAAKCRDB/BR4rcrs Cf9iCACPvFiFv6Hkzo4LAMaMJ9rXAJObT4N/xkaVjR529Kc8MZ7T64jw2JGjBvd6CUdLeUEdFoR DVGlDHb4B4cFKt7xlszr4UECnguP7OpZailyI+8pPKajoYgscifIaz3IyJkwW3Icr4164NgUwO+ UN1IG9waEIhl47DW0+xBOkHAhsGHnQtn1mjlBsI9SKqhodYkzLtKeRYiKBcglpcgUVLN0L3n/S2 6IMmfrU9cJKu43DigUV5rq76x5uEzWyh8GdlFkOjJVHN7QfBwlE7C3AyyJ088S9hSif2lfuxgbY dFjL65itVfBwQ+GKc1JxQ7kMk6T/adRzP4fw4VWq4LXXkbAO X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Reviewed-by: Kieran Bingham Link: https://lore.kernel.org/lkml/20221121102705.16092-1-u.kleine-koenig@p= engutronix.de Signed-off-by: Uwe Kleine-K=C3=B6nig Acked-by: Hans Verkuil --- drivers/media/i2c/ov5695.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c index 61906fc54e37..b287c28920a6 100644 --- a/drivers/media/i2c/ov5695.c +++ b/drivers/media/i2c/ov5695.c @@ -1267,8 +1267,7 @@ static int ov5695_configure_regulators(struct ov5695 = *ov5695) ov5695->supplies); } =20 -static int ov5695_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ov5695_probe(struct i2c_client *client) { struct device *dev =3D &client->dev; struct ov5695 *ov5695; @@ -1393,7 +1392,7 @@ static struct i2c_driver ov5695_i2c_driver =3D { .pm =3D &ov5695_pm_ops, .of_match_table =3D of_match_ptr(ov5695_of_match), }, - .probe =3D &ov5695_probe, + .probe_new =3D &ov5695_probe, .remove =3D &ov5695_remove, }; =20 --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 02662C678DB for ; Fri, 24 Feb 2023 12:06:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230028AbjBXMGm (ORCPT ); Fri, 24 Feb 2023 07:06:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjBXMG1 (ORCPT ); Fri, 24 Feb 2023 07:06:27 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB78B658CF for ; Fri, 24 Feb 2023 04:06:21 -0800 (PST) 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 1pVWq5-0000cR-1X; Fri, 24 Feb 2023 13:06:13 +0100 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 1pVWq2-007Azo-1R; Fri, 24 Feb 2023 13:06:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq2-006EZ1-KU; Fri, 24 Feb 2023 13:06:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Shunqian Zheng , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Kieran Bingham Subject: [PATCH 6/9] media: i2c: ov2685: convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:57 +0100 Message-Id: <20230224120600.1681685-7-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1206; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=7yv9mXh7sjTNuiY/jTjA3naqJ/nYBGzIZt6uw2F2D8c=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgXRLWoSMNc/bOdJhtHrW/tFpDl/midGdlNh EXU3p1BKUOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioFwAKCRDB/BR4rcrs CZbjB/0UsaLUVBgtMCn930I2FROj9MNO1M3bCOISey8f0uxBInDAVmq6o3D6bJ73bPnFyeXEwuf sEv4WmCNjBqeOhLDJiO/gz4SAjK1hXawlmaTiZaRX24hFRTBfrgHa9qj2dlhNJEnUc2otfoljnK WrScX67pVMIVASZXj+49u1rEXFoYQui4RwHsR/TafjSoLBQGSKftFHFr/+fVNlggOW4BjSTwVyS u8REwitycX4UuuKxVQb8iSaKM0I1Ax/RmX26uPeAQZ+EJf9C1+BDi5OUAr3lRgymabA0oOrJe0Q 42IQ2Rx/4+6a5yU5FEGe1cQYCZX9ylgsZ29kaqTRlvTb/RYA X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Reviewed-by: Kieran Bingham Link: https://lore.kernel.org/lkml/20221121102838.16448-1-u.kleine-koenig@p= engutronix.de Signed-off-by: Uwe Kleine-K=C3=B6nig Acked-by: Hans Verkuil --- drivers/media/i2c/ov2685.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c index a3b524f15d89..1c80b121e7d6 100644 --- a/drivers/media/i2c/ov2685.c +++ b/drivers/media/i2c/ov2685.c @@ -707,8 +707,7 @@ static int ov2685_configure_regulators(struct ov2685 *o= v2685) ov2685->supplies); } =20 -static int ov2685_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ov2685_probe(struct i2c_client *client) { struct device *dev =3D &client->dev; struct ov2685 *ov2685; @@ -830,7 +829,7 @@ static struct i2c_driver ov2685_i2c_driver =3D { .pm =3D &ov2685_pm_ops, .of_match_table =3D of_match_ptr(ov2685_of_match), }, - .probe =3D &ov2685_probe, + .probe_new =3D &ov2685_probe, .remove =3D &ov2685_remove, }; =20 --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 02BB3C678DB for ; Fri, 24 Feb 2023 12:06:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbjBXMGV (ORCPT ); Fri, 24 Feb 2023 07:06:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229889AbjBXMGS (ORCPT ); Fri, 24 Feb 2023 07:06:18 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BE2865332 for ; Fri, 24 Feb 2023 04:06:17 -0800 (PST) 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 1pVWq4-0000eJ-RL; Fri, 24 Feb 2023 13:06:12 +0100 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 1pVWq2-007B02-SE; Fri, 24 Feb 2023 13:06:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq2-006EZ6-R5; Fri, 24 Feb 2023 13:06:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones Subject: [PATCH 7/9] i2c: Switch .probe() to not take an id parameter Date: Fri, 24 Feb 2023 13:05:58 +0100 Message-Id: <20230224120600.1681685-8-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=2393; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=+71wz5skFwCbbBFUgxFsdJ/u5S/S5H9btbK8684v6tg=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgbOSV8eecJXtOE/I8vpmKMer7YYUfbvTfuh 4KIf3VbH3CJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioGwAKCRDB/BR4rcrs Cd/hB/0QzSnaB2XApeqnwGVmjBbn1JKEt8p2M1ZjndmWBEcd6p9MNhUpiTNnfFu4F0hI+E/2Kz/ jdIypObLyi6RXzZFRQkCrVCMd+4v2cLcgzFDbsH3ATwLcDsuSR5qv2gJp8WOnpNlSS3RDem5sUr 0H07bF0xOdXztWWbaWhsJOX1YzNnk74lel98uHQ7RhRk62AAfO2BZ7TvaLImJQ63HvTlmEQ8Jht lomnKcSA+nFKH/PxTX9laKHiCJFS608+fUeEJVfn1xDVFpcajsrWkHlPjfCM5k2KcEjEax3uhFg pvdawi8s275N/SCAav1LQKCmOIzAyXmHG3dNpp8VXNdlzZce X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type") introduced a new probe callback to convert i2c init routines to not take an i2c_device_id parameter. Now that all in-tree drivers are converted to the temporary .probe_new() callback, .probe() can be modified to match the desired prototype. Now that .probe() and .probe_new() have the same semantic, they can be defined as members of an anonymous union to save some memory and simplify the core code a bit. Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/i2c/i2c-core-base.c | 11 ++--------- include/linux/i2c.h | 14 +++++++++----- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 087e480b624c..1fbe16221085 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -558,15 +558,8 @@ static int i2c_device_probe(struct device *dev) goto err_detach_pm_domain; } =20 - /* - * When there are no more users of probe(), - * rename probe_new to probe. - */ - if (driver->probe_new) - status =3D driver->probe_new(client); - else if (driver->probe) - status =3D driver->probe(client, - i2c_match_id(driver->id_table, client)); + if (driver->probe) + status =3D driver->probe(client); else status =3D -EINVAL; =20 diff --git a/include/linux/i2c.h b/include/linux/i2c.h index d84e0e99f084..c3e022d53182 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -272,14 +272,18 @@ enum i2c_driver_flags { struct i2c_driver { unsigned int class; =20 + union { /* Standard driver model interfaces */ - int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); + int (*probe)(struct i2c_client *client); + /* + * Legacy callback that was part of a conversion of .probe(). + * Today it has the same semantic as .probe(). Don't use for new + * code. + */ + int (*probe_new)(struct i2c_client *client); + }; void (*remove)(struct i2c_client *client); =20 - /* New driver model interface to aid the seamless removal of the - * current probe()'s, more commonly unused than used second parameter. - */ - int (*probe_new)(struct i2c_client *client); =20 /* driver model interfaces that don't relate to enumeration */ void (*shutdown)(struct i2c_client *client); --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 77C73C61DA4 for ; Fri, 24 Feb 2023 12:06:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229767AbjBXMGg (ORCPT ); Fri, 24 Feb 2023 07:06:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229951AbjBXMG1 (ORCPT ); Fri, 24 Feb 2023 07:06:27 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B6376533E for ; Fri, 24 Feb 2023 04:06:21 -0800 (PST) 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 1pVWq5-0000cr-Po; Fri, 24 Feb 2023 13:06:13 +0100 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 1pVWq2-007Azy-Ff; Fri, 24 Feb 2023 13:06:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq3-006EZ9-0k; Fri, 24 Feb 2023 13:06:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Michael Hennerich , Peter Rosin , Guenter Roeck , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] i2c: mux: Convert all drivers to new .probe() callback Date: Fri, 24 Feb 2023 13:05:59 +0100 Message-Id: <20230224120600.1681685-9-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1908; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=HxKNKaD00JoFVk6SwuLkqQlTsGt6ppNbQZJbFgHADZM=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+Kge0A/yvIYizp+VRjhKF1BWVxexmJ3/e8od7 5Fk7GMtqJCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioHgAKCRDB/BR4rcrs CccACACWHBowhYVb19QXDMNU1/SaBt3C/AeioycgWCTrWlkkJ5ZXruliVYX+6b/jwmGg4QZUXxE pssD7dRtb3mudFvdne6kCBnYo8bFmch7MEnaFCsoK6Kr3AdUqX65lUKja9vPsHoISfgRdsBy4sG hl4dm22sq8TClpBlLGoNVqajAwWG3XAenNX4a55IhPoJhLXTO82SN0Bn1OKSfE1P0gemYuvhtq6 pK4j75pA1NBd0saoNKJ8rjJCzw01+EvU4Anl1ZiFdTHqt9IeGTdnSZqhFnkrGTJhSQL+QwKl3Ds RSsdldPGxh/8Aq4Kg38r2TEE2+CgypfEqMiEukk1PdFwfPOq X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that .probe() was changed not to get the id parameter, drivers can be converted back to that with the eventual goal to drop .probe_new(). Implement that for the i2c mux drivers. Signed-off-by: Uwe Kleine-K=C3=B6nig Acked-by: Guenter Roeck Acked-by: Peter Rosin --- drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +- drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-ltc4306.c b/drivers/i2c/muxes/i2c-mu= x-ltc4306.c index 70835825083f..5a03031519be 100644 --- a/drivers/i2c/muxes/i2c-mux-ltc4306.c +++ b/drivers/i2c/muxes/i2c-mux-ltc4306.c @@ -306,7 +306,7 @@ static struct i2c_driver ltc4306_driver =3D { .name =3D "ltc4306", .of_match_table =3D of_match_ptr(ltc4306_of_match), }, - .probe_new =3D ltc4306_probe, + .probe =3D ltc4306_probe, .remove =3D ltc4306_remove, .id_table =3D ltc4306_id, }; diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mu= x-pca9541.c index 09d1d9e67e31..ce0fb69249a8 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -336,7 +336,7 @@ static struct i2c_driver pca9541_driver =3D { .name =3D "pca9541", .of_match_table =3D of_match_ptr(pca9541_of_match), }, - .probe_new =3D pca9541_probe, + .probe =3D pca9541_probe, .remove =3D pca9541_remove, .id_table =3D pca9541_id, }; diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mu= x-pca954x.c index 3639e6d7304c..0ccee2ae5720 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver =3D { .pm =3D &pca954x_pm, .of_match_table =3D pca954x_of_match, }, - .probe_new =3D pca954x_probe, + .probe =3D pca954x_probe, .remove =3D pca954x_remove, .id_table =3D pca954x_id, }; --=20 2.39.1 From nobody Tue Sep 9 22:49:39 2025 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 E318BC61DA3 for ; Fri, 24 Feb 2023 12:06:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229943AbjBXMGZ (ORCPT ); Fri, 24 Feb 2023 07:06:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbjBXMGS (ORCPT ); Fri, 24 Feb 2023 07:06:18 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BDC065336 for ; Fri, 24 Feb 2023 04:06:17 -0800 (PST) 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 1pVWq4-0000eR-TY; Fri, 24 Feb 2023 13:06:12 +0100 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 1pVWq3-007B05-2n; Fri, 24 Feb 2023 13:06:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq3-006EZD-7M; Fri, 24 Feb 2023 13:06:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] i2c: Convert drivers to new .probe() callback Date: Fri, 24 Feb 2023 13:06:00 +0100 Message-Id: <20230224120600.1681685-10-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=2320; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=8cexTMV14qFlDVuIXD7jYIZgWUBN5i6f1Hvt7C9j40g=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBj+KgiKyLe6sNlsuZiFmGT83SWbvpE+de+Dztv1 qKkLYWIl5eJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY/ioIgAKCRDB/BR4rcrs CR6qB/94FBVBPf+3KRfvfUbSDM6suyp+EVRroDASxcnN0Z774uBmKRE/pZgYshSSaswCHhKbjMB j1A1xI2hIyKYKptGGUKF7rtcG12KbqTz1GwxWO393ybbdyPsJ8wX4EAlkLIfXbduT3KdJCeO1po pA2EHsbqQmADgwlYC8VwwySVUZ7kwy/8T209s99QyefUW09oiHqi17RXy1hppm/m4FGD/lrZ0Gc /pJ2t1/J2Sdcol6vhr6yiX7vMwp3GZB0N6gSOk7wuS+oS/P8gRWu+0c5HRuQ9FIGlKzDlP2VNKj cQOE7dzelvl5omBeJM3kagwYiDvXrrM9X1cu6lSh5nj974fi X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that .probe() was changed not to get the id parameter, drivers can be converted back to that with the eventual goal to drop .probe_new(). Implement that for the i2c drivers that are part of the i2c core. Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-slave-eeprom.c | 2 +- drivers/i2c/i2c-slave-testunit.c | 2 +- drivers/i2c/i2c-smbus.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 1fbe16221085..1e38bdaf6ec1 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1018,7 +1018,7 @@ static int dummy_probe(struct i2c_client *client) =20 static struct i2c_driver dummy_driver =3D { .driver.name =3D "dummy", - .probe_new =3D dummy_probe, + .probe =3D dummy_probe, .id_table =3D dummy_id, }; =20 diff --git a/drivers/i2c/i2c-slave-eeprom.c b/drivers/i2c/i2c-slave-eeprom.c index 5f25f23c4ff8..5946c0d0aef9 100644 --- a/drivers/i2c/i2c-slave-eeprom.c +++ b/drivers/i2c/i2c-slave-eeprom.c @@ -207,7 +207,7 @@ static struct i2c_driver i2c_slave_eeprom_driver =3D { .driver =3D { .name =3D "i2c-slave-eeprom", }, - .probe_new =3D i2c_slave_eeprom_probe, + .probe =3D i2c_slave_eeprom_probe, .remove =3D i2c_slave_eeprom_remove, .id_table =3D i2c_slave_eeprom_id, }; diff --git a/drivers/i2c/i2c-slave-testunit.c b/drivers/i2c/i2c-slave-testu= nit.c index 75ee7ebdb614..a49642bbae4b 100644 --- a/drivers/i2c/i2c-slave-testunit.c +++ b/drivers/i2c/i2c-slave-testunit.c @@ -171,7 +171,7 @@ static struct i2c_driver i2c_slave_testunit_driver =3D { .driver =3D { .name =3D "i2c-slave-testunit", }, - .probe_new =3D i2c_slave_testunit_probe, + .probe =3D i2c_slave_testunit_probe, .remove =3D i2c_slave_testunit_remove, .id_table =3D i2c_slave_testunit_id, }; diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index cd19546d31fc..138c3f5e0093 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -169,7 +169,7 @@ static struct i2c_driver smbalert_driver =3D { .driver =3D { .name =3D "smbus_alert", }, - .probe_new =3D smbalert_probe, + .probe =3D smbalert_probe, .remove =3D smbalert_remove, .id_table =3D smbalert_ids, }; --=20 2.39.1