From patchwork Sun Oct 23 13:22:40 2022 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: 13016260 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 307F0ECAAA1 for ; Sun, 23 Oct 2022 13:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230492AbiJWNXj (ORCPT ); Sun, 23 Oct 2022 09:23:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230472AbiJWNXc (ORCPT ); Sun, 23 Oct 2022 09:23:32 -0400 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 428367173E for ; Sun, 23 Oct 2022 06:23:31 -0700 (PDT) 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 1omawX-0006qG-Vn; Sun, 23 Oct 2022 15:23:10 +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 1omawV-000ygD-Tg; Sun, 23 Oct 2022 15:23:07 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawU-00A3Qe-WB; Sun, 23 Oct 2022 15:23:07 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Lars-Peter Clausen , Michael Hennerich , Cosmin Tanislav , Jonathan Cameron Cc: Wolfram Sang , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 01/23] iio: accel: adxl367: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:40 +0200 Message-Id: <20221023132302.911644-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1071; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=nWmLzYKzE7R8Q3GvuNL7ihDfXgv5MnRVXj6oD/1j3f8=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9BOYnJF+OtrhIWZjiOMeBOvs3AQOy9HZA44BJX mYeCrrqJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/QQAKCRDB/BR4rcrsCSEdB/ 0RhunkJZLseqfB4UPhFaFYApg2QamMXcNXR5DyBq1LDRNSfVYpkO4wBHXxkvZzi/B6O5OBJebgbpUy MA9HrOr/5PpYiJhleICFfijdYCJHoiw4HMJcPwxuyZ7HXUDHQRBECgRoUGHEVMM5PS2feAN76X09Kn D6vkj7Fwi+YxaFxVtFgpPicprSnPkie/itCtOtdXWyfQWcFJPbM/+f09eTCvLXBLpCYix52/FftorG 6tXMQBEFwTdqy8pw90tcRSF+tyHDcHWsmsMCS+zv9bzYQkPzXVdj1JJxql/Zn91Yvju3mbxOSl+zIh fZRwdkI0ep1ky2o0UhbcU60EkvJJyY 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/adxl367_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/adxl367_i2c.c b/drivers/iio/accel/adxl367_i2c.c index 3606efa25835..070aad724abd 100644 --- a/drivers/iio/accel/adxl367_i2c.c +++ b/drivers/iio/accel/adxl367_i2c.c @@ -41,8 +41,7 @@ static const struct adxl367_ops adxl367_i2c_ops = { .read_fifo = adxl367_i2c_read_fifo, }; -static int adxl367_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adxl367_i2c_probe(struct i2c_client *client) { struct adxl367_i2c_state *st; struct regmap *regmap; @@ -78,7 +77,7 @@ static struct i2c_driver adxl367_i2c_driver = { .name = "adxl367_i2c", .of_match_table = adxl367_of_match, }, - .probe = adxl367_i2c_probe, + .probe_new = adxl367_i2c_probe, .id_table = adxl367_i2c_id, }; From patchwork Sun Oct 23 13:22:41 2022 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: 13016255 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 2C7A8ECAAA1 for ; Sun, 23 Oct 2022 13:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230379AbiJWNXg (ORCPT ); Sun, 23 Oct 2022 09:23:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 04C736FC51 for ; Sun, 23 Oct 2022 06:23:30 -0700 (PDT) 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 1omawX-0006qJ-Vo; Sun, 23 Oct 2022 15:23:10 +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 1omawW-000ygP-Io; Sun, 23 Oct 2022 15:23:08 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawV-00A3Qh-6X; Sun, 23 Oct 2022 15:23:07 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron Cc: Wolfram Sang , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 02/23] iio: accel: adxl372: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:41 +0200 Message-Id: <20221023132302.911644-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1760; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=jhwmHl4KehWAQNkUqeCSBfJJ0hRVOmxjhfMDDNXfRbI=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9EOsEr6zhCa/Z7YivkPrtQ6BsnxeXSdmJ2tU2X m0srv+eJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/RAAKCRDB/BR4rcrsCUV5CA CdtYAJtL6vMnbJNLli5SSmCYYPHdWZ6NLVEWHPbVUk2aFXuPYhzisktbI5tG5rLkz+SrPqDgsXIXy7 3wiUDTyAdSly6UssvsKi6HRV8FgVL7KbEwZm4T3YfDtbBYRGVdKaJhwZ9L3mePuSUrI74XOlNInEY5 JkOxU8K2Za5fYyN5tvq+oMlsS02F1xvpulUOYlnsT/vlF2hrfRUZoOGhMeUeNsyqfiI9jOHi+6A1dN fBBRMR21VLRKqvYhkxZSXne30JB/FQwGDlnrmKlxhSyKypZ7QPCNUaIBRHww8rET+/8tZcmEyCyyKK L9VYGNq2BSTr/KLTV32A2asxEuoYC5 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/adxl372_i2c.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/iio/accel/adxl372_i2c.c b/drivers/iio/accel/adxl372_i2c.c index 4efb70a5fe40..5a21c1bcf2d8 100644 --- a/drivers/iio/accel/adxl372_i2c.c +++ b/drivers/iio/accel/adxl372_i2c.c @@ -18,9 +18,15 @@ static const struct regmap_config adxl372_regmap_config = { .readable_noinc_reg = adxl372_readable_noinc_reg, }; -static int adxl372_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id adxl372_i2c_id[] = { + { "adxl372", 0 }, + {} +}; +MODULE_DEVICE_TABLE(i2c, adxl372_i2c_id); + +static int adxl372_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(adxl372_i2c_id, client); struct regmap *regmap; unsigned int regval; int ret; @@ -41,12 +47,6 @@ static int adxl372_i2c_probe(struct i2c_client *client, return adxl372_probe(&client->dev, regmap, client->irq, id->name); } -static const struct i2c_device_id adxl372_i2c_id[] = { - { "adxl372", 0 }, - {} -}; -MODULE_DEVICE_TABLE(i2c, adxl372_i2c_id); - static const struct of_device_id adxl372_of_match[] = { { .compatible = "adi,adxl372" }, { } @@ -58,7 +58,7 @@ static struct i2c_driver adxl372_i2c_driver = { .name = "adxl372_i2c", .of_match_table = adxl372_of_match, }, - .probe = adxl372_i2c_probe, + .probe_new = adxl372_i2c_probe, .id_table = adxl372_i2c_id, }; From patchwork Sun Oct 23 13:22:42 2022 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: 13016257 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 589EEFA373F for ; Sun, 23 Oct 2022 13:23:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230476AbiJWNXh (ORCPT ); Sun, 23 Oct 2022 09:23:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230457AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 03D976FC4A for ; Sun, 23 Oct 2022 06:23:29 -0700 (PDT) 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 1omawX-0006qH-Vo; Sun, 23 Oct 2022 15:23:10 +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 1omawW-000ygH-4u; Sun, 23 Oct 2022 15:23:08 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawV-00A3Qk-DM; Sun, 23 Oct 2022 15:23:07 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Dan Robertson , Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 03/23] iio: accel: bma400: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:42 +0200 Message-Id: <20221023132302.911644-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1717; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=LFfCPOIAMk+cTROD/thqfLSzOM/JB9AegkaUfckA+jY=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9IZLkBQIYChZWJldf7a7/KlVJ8XEKyYnuPe2++ n8S+mCSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/SAAKCRDB/BR4rcrsCfInB/ 9/c0s4rOpEarUjTJmCgIU5xNDbFXNFOlHqBWD2lUVfgTBbetEcisosqLXb9wvyKSwM6HW46RTtHIa7 uAYUvJ7As/b8aCvorj6iA3RQBPplHbVsxXklYycOTT6MdrFZOxgaFPR0pfmqmiFY67nP4Dv61zSfDk RmsR32gff6itS9YbYff0YqYLiNfWUMwZ8dynD3SJ7PQB4oyWhszsjnMGBrTH5EzKbdNcRM5PkxyhYZ KhMKeD/r8ZzQBDCV4TIUKVJzwI5ZofaYxXTUab/irEAkaXAavc0KDHPsWRZtemPmNHDmo3makPxURY JwQYyjmRc7quqUWmxtZpgxH4IoVwVI 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/bma400_i2c.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c index 1ba2a982ea73..cf7a830d6baf 100644 --- a/drivers/iio/accel/bma400_i2c.c +++ b/drivers/iio/accel/bma400_i2c.c @@ -13,10 +13,16 @@ #include "bma400.h" -static int bma400_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id bma400_i2c_ids[] = { + { "bma400", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, bma400_i2c_ids); + +static int bma400_i2c_probe(struct i2c_client *client) { struct regmap *regmap; + const struct i2c_device_id *id = i2c_match_id(bma400_i2c_ids, client); regmap = devm_regmap_init_i2c(client, &bma400_regmap_config); if (IS_ERR(regmap)) { @@ -27,12 +33,6 @@ static int bma400_i2c_probe(struct i2c_client *client, return bma400_probe(&client->dev, regmap, client->irq, id->name); } -static const struct i2c_device_id bma400_i2c_ids[] = { - { "bma400", 0 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, bma400_i2c_ids); - static const struct of_device_id bma400_of_i2c_match[] = { { .compatible = "bosch,bma400" }, { } @@ -44,7 +44,7 @@ static struct i2c_driver bma400_i2c_driver = { .name = "bma400", .of_match_table = bma400_of_i2c_match, }, - .probe = bma400_i2c_probe, + .probe_new = bma400_i2c_probe, .id_table = bma400_i2c_ids, }; From patchwork Sun Oct 23 13:22:43 2022 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: 13016259 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 AE7FFFA3740 for ; Sun, 23 Oct 2022 13:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230435AbiJWNXi (ORCPT ); Sun, 23 Oct 2022 09:23:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230470AbiJWNXc (ORCPT ); Sun, 23 Oct 2022 09:23:32 -0400 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 2B9316F240 for ; Sun, 23 Oct 2022 06:23:31 -0700 (PDT) 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 1omawY-0006qK-6W; Sun, 23 Oct 2022 15:23:10 +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 1omawW-000ygT-M5; Sun, 23 Oct 2022 15:23:08 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawV-00A3Qn-JI; Sun, 23 Oct 2022 15:23:07 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron , Lars-Peter Clausen Cc: Wolfram Sang , Srinivas Pandruvada , Benjamin Mugnier , Peter Senna Tschudin , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 04/23] iio: accel: bmc150: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:43 +0200 Message-Id: <20221023132302.911644-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2302; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=fHItEGJyJDkYJNBVev9dQabYNuL2uv9gbyYFmhiShnY=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9LJMvZ+jA5scSFMdKL4LJv3woZofUfXUzsNFS2 CH3I8pSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/SwAKCRDB/BR4rcrsCYYrB/ 4pOKMyeusXANJlgY8EpUmAJWim9gDDAEcV421zpgY7Durt+cVUu6dDQo+GJRwKf/FdukQ91o6PEKKr xodhh+0FliC3TDKk9ihelq5XmnejOpglhUZzSuhcT4S1CY1ZOqEeZJ9Bf3D7Xeu40zQTX3boLS8YoX y28qqyeOJMTQ3glI5S7IuWAZrAMy+OnOY/r9czzs9nNvfpbcxZNom3Auu0hQxd1rE1JJ3eEWZDIImN 9HbSS6vDXzVDQTjxCFJf3etbesd0eIJbRdK4cFHqKxZqAdd+TQktLnk656WsFXCw2Ta48aBOPcneju Ud4hCJpSx5bB5iC+oFGMiHQD68VdKX 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/bmc150-accel-i2c.c | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c index be8cc598b88e..0184106d0b65 100644 --- a/drivers/iio/accel/bmc150-accel-i2c.c +++ b/drivers/iio/accel/bmc150-accel-i2c.c @@ -171,9 +171,24 @@ static void bmc150_acpi_dual_accel_probe(struct i2c_client *client) {} static void bmc150_acpi_dual_accel_remove(struct i2c_client *client) {} #endif -static int bmc150_accel_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id bmc150_accel_id[] = { + {"bma222"}, + {"bma222e"}, + {"bma250e"}, + {"bma253"}, + {"bma254"}, + {"bma255"}, + {"bma280"}, + {"bmc150_accel"}, + {"bmc156_accel", BOSCH_BMC156}, + {"bmi055_accel"}, + {} +}; +MODULE_DEVICE_TABLE(i2c, bmc150_accel_id); + +static int bmc150_accel_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(bmc150_accel_id, client); struct regmap *regmap; const char *name = NULL; enum bmc150_type type = BOSCH_UNKNOWN; @@ -231,22 +246,6 @@ static const struct acpi_device_id bmc150_accel_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match); -static const struct i2c_device_id bmc150_accel_id[] = { - {"bma222"}, - {"bma222e"}, - {"bma250e"}, - {"bma253"}, - {"bma254"}, - {"bma255"}, - {"bma280"}, - {"bmc150_accel"}, - {"bmc156_accel", BOSCH_BMC156}, - {"bmi055_accel"}, - {} -}; - -MODULE_DEVICE_TABLE(i2c, bmc150_accel_id); - static const struct of_device_id bmc150_accel_of_match[] = { { .compatible = "bosch,bma222" }, { .compatible = "bosch,bma222e" }, @@ -269,7 +268,7 @@ static struct i2c_driver bmc150_accel_driver = { .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match), .pm = &bmc150_accel_pm_ops, }, - .probe = bmc150_accel_probe, + .probe_new = bmc150_accel_probe, .remove = bmc150_accel_remove, .id_table = bmc150_accel_id, }; From patchwork Sun Oct 23 13:22:44 2022 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: 13016248 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 BEA47FA3740 for ; Sun, 23 Oct 2022 13:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230421AbiJWNXb (ORCPT ); Sun, 23 Oct 2022 09:23:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230434AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 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 1ED086FC51 for ; Sun, 23 Oct 2022 06:23:28 -0700 (PDT) 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 1omawX-0006qI-Vn; Sun, 23 Oct 2022 15:23:10 +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 1omawW-000ygM-EQ; Sun, 23 Oct 2022 15:23:08 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawV-00A3Qq-PN; Sun, 23 Oct 2022 15:23:07 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Paul Cercueil , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 05/23] iio: accel: da280: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:44 +0200 Message-Id: <20221023132302.911644-6-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1819; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=QIQs/Y/e+MIhj8+TvOC6A0wy0PmK3cz0xM5StBM1B8I=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9P3G6bGq1xiHzZMOzU9Uqa/q17y3vtaiI9CzIQ tSllCpCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/TwAKCRDB/BR4rcrsCUUbB/ 9UzGWMwvaJiSua1Tkm1RczKdabi1QmRS4PcexO7tWXgDde1eEnr0jmF7YTFiTYAirCYnIBK1Rgnvci Rf4nHbvOfooeriCtSV7ZHOVt2TNKW+xFM9it9JzPlqGLKgL1te4xKv+jSPEw7ZOe1+K0pJhLovRxUo fg+r5TBAxneAlfKKDt0LzZOhLN+fuIL9BA8NP2kZoQUKgxn9D/9LbpOBSWO2GSxTbqsF9sg3tkJ6ed 1IlsuLB1qt8X5YgIAM9YfXh0kHRiWQ0RSn1/xJkAivVHia5g6drFLF2mtqTCwkgO4Y87MKazEbCfrZ 3m8wgqj40cV+Wblg+gDLR7dVB2bFQq 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/da280.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/iio/accel/da280.c b/drivers/iio/accel/da280.c index 04e9c5678964..72a6a835ee74 100644 --- a/drivers/iio/accel/da280.c +++ b/drivers/iio/accel/da280.c @@ -105,8 +105,14 @@ static void da280_disable(void *client) da280_enable(client, false); } -static int da280_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id da280_i2c_id[] = { + { "da226", da226 }, + { "da280", da280 }, + {} +}; +MODULE_DEVICE_TABLE(i2c, da280_i2c_id); + +static int da280_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -131,6 +137,9 @@ static int da280_probe(struct i2c_client *client, if (ACPI_HANDLE(&client->dev)) { chip = da280_match_acpi_device(&client->dev); } else { + const struct i2c_device_id *id = + i2c_match_id(da280_i2c_id, client); + chip = id->driver_data; } @@ -171,20 +180,13 @@ static const struct acpi_device_id da280_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, da280_acpi_match); -static const struct i2c_device_id da280_i2c_id[] = { - { "da226", da226 }, - { "da280", da280 }, - {} -}; -MODULE_DEVICE_TABLE(i2c, da280_i2c_id); - static struct i2c_driver da280_driver = { .driver = { .name = "da280", .acpi_match_table = ACPI_PTR(da280_acpi_match), .pm = pm_sleep_ptr(&da280_pm_ops), }, - .probe = da280_probe, + .probe_new = da280_probe, .id_table = da280_i2c_id, }; From patchwork Sun Oct 23 13:22:45 2022 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: 13016243 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 F25B4C433FE for ; Sun, 23 Oct 2022 13:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230431AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229961AbiJWNX1 (ORCPT ); Sun, 23 Oct 2022 09:23:27 -0400 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 BFB876F562 for ; Sun, 23 Oct 2022 06:23:26 -0700 (PDT) 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 1omawX-0006qL-Vo; Sun, 23 Oct 2022 15:23:10 +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 1omawW-000ygX-SM; Sun, 23 Oct 2022 15:23:08 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawV-00A3Qv-WD; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Paul Cercueil , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 06/23] iio: accel: da311: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:45 +0200 Message-Id: <20221023132302.911644-7-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=965; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=BpfBvxhBRHzlFTrrj+ZF3PINXXACbjnYtz2zh8D5noo=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9SziiOeiZRFnT/5x1KTQ2eIhka2Cn6h9J3nmlc h7abQpeJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/UgAKCRDB/BR4rcrsCdpJB/ 0aTBAg6u9dWs6anDyPVlm63/6Uzp/jcXQjgIydqqPf5YNxigFG1OWhrV5GOfZrMCbW8Wu1Wm+NSBJd oLf+iHZHbloGCJ+lRZIMXc6Hx0/2icg5OqLmOlMSFfu8zO5QouIQbtIVHeCE14kneU9S9q0CXm2euw FuZJzy92R7+SjyMtZGx6aUqbmq/00iOMNDaadpkfbSLhWZpovrS0OrWbL6OCa0P5Wc/trmBaSRxMuu msYF2d/Hp+z6tRxwUZGLnyQgtKUDOkmIpm/DUV/55OsPE8ikvWadfNTJJs7m44s8cywveajFHmqx9d yAyJiejQoy0WQGXtLRCcT4hwrOY0lF 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/da311.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/da311.c b/drivers/iio/accel/da311.c index ec4e29d260f7..080335fa2ad6 100644 --- a/drivers/iio/accel/da311.c +++ b/drivers/iio/accel/da311.c @@ -217,8 +217,7 @@ static void da311_disable(void *client) da311_enable(client, false); } -static int da311_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int da311_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -279,7 +278,7 @@ static struct i2c_driver da311_driver = { .name = "da311", .pm = pm_sleep_ptr(&da311_pm_ops), }, - .probe = da311_probe, + .probe_new = da311_probe, .id_table = da311_i2c_id, }; From patchwork Sun Oct 23 13:22:46 2022 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: 13016244 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 56A4FECAAA1 for ; Sun, 23 Oct 2022 13:23:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbiJWNX3 (ORCPT ); Sun, 23 Oct 2022 09:23:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 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 BF3176F240 for ; Sun, 23 Oct 2022 06:23:26 -0700 (PDT) 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 1omawX-0006qM-Vo; Sun, 23 Oct 2022 15:23:10 +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 1omawX-000ygb-2q; Sun, 23 Oct 2022 15:23:09 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawW-00A3R0-5w; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Paul Cercueil , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 07/23] iio: accel: dmard06: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:46 +0200 Message-Id: <20221023132302.911644-8-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1067; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=+4i03y1bOf5kLI4Gr3ydWtojkzOgNa34s+opu7prNmg=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9VEZQ78l6aPSNGCv3/NPbR6CHM3v32M9WtQJTE PJljOc2JATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/VQAKCRDB/BR4rcrsCbsZB/ 4yYYyZf0YgMcFboDXTbWN5Xxj9ed3hBZP9ykAZMtS8V1OzucmyZ59B8x4FtRuvSoQ7nbFioG/NJOB/ KJq2cAOwoI4DIEwpdjIm6Q1wJxsSUluHvRsFn9Q2izIjI5j01q6z8c6xVCRIOswWtxf6Tp+Rp/Z4mU ZZtNPzqzlgjXHIz2+gK1zniNTVlZmQdxRZHtq5qDU3aDAA4PVWjgc/cbosg7mNlV0aiXukKp6VB+SN +9YjBfaIVMkjx3tp2fET/bnyGA/g9rFahq233jfUgg+nhgaItDgoEareFhujnEN2YsPyhNxS5oWJUU hSqIHfH/O6atYr9CFuW1DKLs1RCQsd 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/dmard06.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/dmard06.c b/drivers/iio/accel/dmard06.c index 4b69c8530f5e..7390509aaac0 100644 --- a/drivers/iio/accel/dmard06.c +++ b/drivers/iio/accel/dmard06.c @@ -125,8 +125,7 @@ static const struct iio_info dmard06_info = { .read_raw = dmard06_read_raw, }; -static int dmard06_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int dmard06_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -218,7 +217,7 @@ static const struct of_device_id dmard06_of_match[] = { MODULE_DEVICE_TABLE(of, dmard06_of_match); static struct i2c_driver dmard06_driver = { - .probe = dmard06_probe, + .probe_new = dmard06_probe, .id_table = dmard06_id, .driver = { .name = DMARD06_DRV_NAME, From patchwork Sun Oct 23 13:22:47 2022 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: 13016251 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 66A85C433FE for ; Sun, 23 Oct 2022 13:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbiJWNXe (ORCPT ); Sun, 23 Oct 2022 09:23:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 60D1C6F562 for ; Sun, 23 Oct 2022 06:23:29 -0700 (PDT) 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 1omawY-0006qN-IL; Sun, 23 Oct 2022 15:23:10 +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 1omawX-000yge-4B; Sun, 23 Oct 2022 15:23:09 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawW-00A3R4-C7; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Gwendal Grignou , Paul Lemmermann , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 08/23] iio: accel: dmard09: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:47 +0200 Message-Id: <20221023132302.911644-9-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=972; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=uvFvi615xvhp1lwh884R/Mulpt4zvhwe4O3mxXE+y7o=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9YNGxnKgX6tWvghBcWa/rua5wXPGBlZqyrPqy0 u6vXvXOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/WAAKCRDB/BR4rcrsCfbTB/ wMFNGPytUrkAWa4fGpvuxfA6gIAsujQzLKNmzhkwwkTlb8yDoTxCUaRx81Pa77CzS+B2/6icwNpvaF WlnER7mSBuxUGyUwVtBXXuO48OYTukCN3KHwPwB/pQLW0tDOZOfeUurpkt8m37tRLVIAISRaMglwSx 31UCBUcgjM+8XE9uwi5jHJ3bxYgYXuAaNw1TI4g3Y5dVvch0SnfWvWzKu+CyNRm0yxq968U7EPcYtC lpR4uwYSiN5EpcHeW7GwpLeuHKX+INCcT01j0KKmF3B4qzzxvRIDHJYtWux1IgWdGNHFkfy8+5q2Ri aDoyiRN28MZ612YQkzL0F9oigZCvqK 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/dmard09.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c index cb0246ca72f3..4b7a537f617d 100644 --- a/drivers/iio/accel/dmard09.c +++ b/drivers/iio/accel/dmard09.c @@ -88,8 +88,7 @@ static const struct iio_info dmard09_info = { .read_raw = dmard09_read_raw, }; -static int dmard09_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int dmard09_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -136,7 +135,7 @@ static struct i2c_driver dmard09_driver = { .driver = { .name = DMARD09_DRV_NAME }, - .probe = dmard09_probe, + .probe_new = dmard09_probe, .id_table = dmard09_id, }; From patchwork Sun Oct 23 13:22:48 2022 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: 13016245 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 991DEFA373F for ; Sun, 23 Oct 2022 13:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230448AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 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 BFA386F27A for ; Sun, 23 Oct 2022 06:23:26 -0700 (PDT) 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 1omawX-0006qO-Vn; Sun, 23 Oct 2022 15:23:10 +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 1omawX-000ygi-7o; Sun, 23 Oct 2022 15:23:09 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawW-00A3R8-IW; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Paul Cercueil , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 09/23] iio: accel: dmard10: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:48 +0200 Message-Id: <20221023132302.911644-10-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=999; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=6Nv7J0OqdrzQLyNHELbm+F+umy26zjOXMd6AGbdlM8E=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9bbFj6NY03zboNKMevMl4mBFu7mQNaUBTsc2mi 0HEWItuJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/WwAKCRDB/BR4rcrsCc2JB/ 93XL9Cl9MJ+oPhurVBHwYUqomveXVDhiX4I4nVl+fd9mELGhUG33x1iZTZ0zjM7GOOphyGW9qbGwIa PsEfzVGlvg1zf582Ey56xDbXr+3owXdgzc3eNo4pNqYCFCp+X26xF6/wbvv3P/4i0tayot2gaxxRvZ Tn0WGGTI4dRg4qG/Tae/L8VOBCq0xvDJQClq0b/ZnsrB6jzvnJoJdCsa7BR/P7w3wxocIZpSbbWvpi 3KHfyL/+vIdVpWsz5Sye2kU9hkto1Cp/EptFvhgpneI1cFEJxeq8EC/J4IOUZEgxgcuI2PjmHz7H8F WIage/3ri0Sci/845hBAnMj36qUV/H 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/dmard10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/dmard10.c b/drivers/iio/accel/dmard10.c index 8ac62ec0a04a..07e68aed8a13 100644 --- a/drivers/iio/accel/dmard10.c +++ b/drivers/iio/accel/dmard10.c @@ -175,8 +175,7 @@ static void dmard10_shutdown_cleanup(void *client) dmard10_shutdown(client); } -static int dmard10_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int dmard10_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -242,7 +241,7 @@ static struct i2c_driver dmard10_driver = { .name = "dmard10", .pm = pm_sleep_ptr(&dmard10_pm_ops), }, - .probe = dmard10_probe, + .probe_new = dmard10_probe, .id_table = dmard10_i2c_id, }; From patchwork Sun Oct 23 13:22:49 2022 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: 13016266 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 5EB40FA373F for ; Sun, 23 Oct 2022 13:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230062AbiJWNXm (ORCPT ); Sun, 23 Oct 2022 09:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230470AbiJWNXl (ORCPT ); Sun, 23 Oct 2022 09:23:41 -0400 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 96E4A7173E for ; Sun, 23 Oct 2022 06:23:40 -0700 (PDT) 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 1omawf-0006rb-85; Sun, 23 Oct 2022 15:23: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 1omawY-000yh2-5q; Sun, 23 Oct 2022 15:23:10 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawW-00A3RD-Oe; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Dmitry Rokosov , Vladimir Oltean , Yang Yingliang , wangjianli , Miaoqian Lin , Gwendal Grignou , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 10/23] iio: accel: kxcjk-1013: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:49 +0200 Message-Id: <20221023132302.911644-11-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2164; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=xPhaMhuh+x1zFOy+/opyWCtfU7DE3ZNhjEULYbez0xk=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9fLT+o/GIJ7Y1eRPbuTYuGNepoNViyqVXJIM0N D2WLX3eJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/XwAKCRDB/BR4rcrsCfxKB/ 9lTYwI9GTUp1Yr/OcQk/SKIww1L1bZ75adsF1TBrkRSbyt9c0QpUT7ZUfrPusMKX8QS6EEdwSfKuFo w6Lxp6iX+1LLHBh/Z8fH8LYBA7Qaj9oILBcoiz+ikyPIMM8BwR8F8jfCSV6l6eDvFXjRWWeERF9HHo uYqZ2IeZD0y/46/Ze2xa8wsRKuvTWLRUxUlpw+co6+AAkHncT2oLEIaZwdj52H5B5mRmLwmv/ivvLH yfguYxC1Ca4Ih9zAqnGS57WEQySFDwJRR17xfTphF4BMNsr4r4r7GuSkv2lQjIj/NCICV5f+oslJVq DtAbcfbYp4zg9FuErhf/Bcz8n0qxW0 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/kxcjk-1013.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index adc66b3615c0..e043dd698747 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -1432,9 +1432,20 @@ static void kxcjk1013_disable_regulators(void *d) regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); } -static int kxcjk1013_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id kxcjk1013_id[] = { + {"kxcjk1013", KXCJK1013}, + {"kxcj91008", KXCJ91008}, + {"kxtj21009", KXTJ21009}, + {"kxtf9", KXTF9}, + {"kx023-1025", KX0231025}, + {"SMO8500", KXCJ91008}, + {} +}; +MODULE_DEVICE_TABLE(i2c, kxcjk1013_id); + +static int kxcjk1013_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(kxcjk1013_id, client); struct kxcjk1013_data *data; struct iio_dev *indio_dev; struct kxcjk_1013_platform_data *pdata; @@ -1720,18 +1731,6 @@ static const struct acpi_device_id kx_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, kx_acpi_match); -static const struct i2c_device_id kxcjk1013_id[] = { - {"kxcjk1013", KXCJK1013}, - {"kxcj91008", KXCJ91008}, - {"kxtj21009", KXTJ21009}, - {"kxtf9", KXTF9}, - {"kx023-1025", KX0231025}, - {"SMO8500", KXCJ91008}, - {} -}; - -MODULE_DEVICE_TABLE(i2c, kxcjk1013_id); - static const struct of_device_id kxcjk1013_of_match[] = { { .compatible = "kionix,kxcjk1013", }, { .compatible = "kionix,kxcj91008", }, @@ -1749,7 +1748,7 @@ static struct i2c_driver kxcjk1013_driver = { .of_match_table = kxcjk1013_of_match, .pm = &kxcjk1013_pm_ops, }, - .probe = kxcjk1013_probe, + .probe_new = kxcjk1013_probe, .remove = kxcjk1013_remove, .id_table = kxcjk1013_id, }; From patchwork Sun Oct 23 13:22:50 2022 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: 13016256 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 3668BC433FE for ; Sun, 23 Oct 2022 13:23:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230456AbiJWNXg (ORCPT ); Sun, 23 Oct 2022 09:23:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbiJWNXb (ORCPT ); Sun, 23 Oct 2022 09:23:31 -0400 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 1F9FB70E7A for ; Sun, 23 Oct 2022 06:23:30 -0700 (PDT) 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 1omawZ-0006r2-4C; Sun, 23 Oct 2022 15:23:11 +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 1omawX-000ygo-Qw; Sun, 23 Oct 2022 15:23:09 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawW-00A3RH-VK; Sun, 23 Oct 2022 15:23:08 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Greg Kroah-Hartman , Jean Delvare , Ajay Gupta , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 11/23] iio: accel: kxsd9: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:50 +0200 Message-Id: <20221023132302.911644-12-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1015; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=AgXJgfOEf0EZfJW6EUQ2AGZwz1abIYHAMx6wgPz7o3I=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9i9uyHGl+Ikl1+g/eF1KOtNiWFA0MxftPoNtUQ gB8shmCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/YgAKCRDB/BR4rcrsCQwJB/ 9AxUH8Zz8YtuYl89kBYS8cKltP1MHQVh0oGYh6qyARvJ9Z1GQxIVTAZS8RSzHXWfXQuEAVG9nX/RE7 EI5hnHOLr29+CvE+mw2lrUJryZBAvZKoeb7ldzPMADc7lAfBE1VVbdLdALXqqVom08cgtsd0Atlg7t 3ZDNfnaSGj9hZ8xr/DJnAWzGkyYFOii3J5YK416M9ZrWi9b9oFIYi8VN9Bo7Cx2eXZAsgwWUSsZZ44 d+pxPak78QsaS4tJo/kjsectCOoe1XORAoFxEOs3WqhuhlbLuiim6iCrgj1Bsvn+xkP2Sxa72jlboW 3+pFpdbNDH9xsK6rx0+SNnoPhRxI0B 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/kxsd9-i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c index 61346ea8ef19..6b3683ddce36 100644 --- a/drivers/iio/accel/kxsd9-i2c.c +++ b/drivers/iio/accel/kxsd9-i2c.c @@ -10,8 +10,7 @@ #include "kxsd9.h" -static int kxsd9_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int kxsd9_i2c_probe(struct i2c_client *i2c) { static const struct regmap_config config = { .reg_bits = 8, @@ -55,7 +54,7 @@ static struct i2c_driver kxsd9_i2c_driver = { .of_match_table = kxsd9_of_match, .pm = pm_ptr(&kxsd9_dev_pm_ops), }, - .probe = kxsd9_i2c_probe, + .probe_new = kxsd9_i2c_probe, .remove = kxsd9_i2c_remove, .id_table = kxsd9_i2c_id, }; From patchwork Sun Oct 23 13:22:51 2022 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: 13016265 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 A1705FA373D for ; Sun, 23 Oct 2022 13:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230074AbiJWNXm (ORCPT ); Sun, 23 Oct 2022 09:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230489AbiJWNXj (ORCPT ); Sun, 23 Oct 2022 09:23:39 -0400 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 BC3BA6FC51 for ; Sun, 23 Oct 2022 06:23:37 -0700 (PDT) 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 1omawd-0006rX-1X; Sun, 23 Oct 2022 15:23:15 +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 1omawY-000ygs-3M; Sun, 23 Oct 2022 15:23:10 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawX-00A3RK-4Y; Sun, 23 Oct 2022 15:23:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Heikki Krogerus , Ajay Gupta , Jeremy Kerr , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 12/23] iio: accel: mc3230: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:51 +0200 Message-Id: <20221023132302.911644-13-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1010; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=dT17HSfsKIwmgupLWarOdfzGSzchGhnysPukyKfnRoA=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9lab4pUFVrcqgGYklYdIkGLWjCO9o0BOkDltsK /P3h1gmJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/ZQAKCRDB/BR4rcrsCdh7CA CaZeVGbMGdnlGO8dSoLeby35mNExPMAlJYlkvHvdySGZscwFWHrUKGLb0ZqOHTemyWNOU4gc3HjfzW vq1DnbgFy9l2UDNxDsiQK0rnC5S83jmBHwKksVwxnbRD5x1RCb6wbj0+UA1J7d82V+8iMFznEWED72 EJ9I7GOzPcENH0qvPwpkMeCrqKAfsHelDfXDNFK3Y2czY1eR76hyKU81BDXkk9EBWe70N43QDXtV86 QUKANvFLaFaCLX2VIYcw9GvQgAzH3cugBo1VCdK3NMwjF1sDIbZKSKW9kTgJoDrQkl7pmH4b+U6wwN 7vlgHn17oHWtiW9CqxYQ/g4xnCf8Kd 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mc3230.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c index 2462000e0519..efc21871de42 100644 --- a/drivers/iio/accel/mc3230.c +++ b/drivers/iio/accel/mc3230.c @@ -106,8 +106,7 @@ static const struct iio_info mc3230_info = { .read_raw = mc3230_read_raw, }; -static int mc3230_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mc3230_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -191,7 +190,7 @@ static struct i2c_driver mc3230_driver = { .name = "mc3230", .pm = pm_sleep_ptr(&mc3230_pm_ops), }, - .probe = mc3230_probe, + .probe_new = mc3230_probe, .remove = mc3230_remove, .id_table = mc3230_i2c_id, }; From patchwork Sun Oct 23 13:22:52 2022 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: 13016261 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 A2635FA373D for ; Sun, 23 Oct 2022 13:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230468AbiJWNXk (ORCPT ); Sun, 23 Oct 2022 09:23:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230482AbiJWNXd (ORCPT ); Sun, 23 Oct 2022 09:23:33 -0400 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 00D786FA04 for ; Sun, 23 Oct 2022 06:23:32 -0700 (PDT) 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 1omawd-0006rm-1W; Sun, 23 Oct 2022 15:23:15 +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 1omawY-000yhB-K7; Sun, 23 Oct 2022 15:23:10 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawX-00A3RQ-AU; Sun, 23 Oct 2022 15:23:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Vladimir Oltean , Maximilian Luz , Jeremy Kerr , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 13/23] iio: accel: mma7455: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:52 +0200 Message-Id: <20221023132302.911644-14-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2009; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=6AZK09z5aZbKSiicqPfRwz2zib92fXlB3DHpRQg0zzg=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9paC8w1zjzusj2KpheVQfoNr2ycOMpyczWIwfh rvr6ZEmJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/aQAKCRDB/BR4rcrsCXg+B/ 998ppriBIjg5xgd7F0aAUr3jSgGBLWpYmGjPs9K+RmWlOCxtViPKrLd+oJ+C14/SL1xnYsEyysCdvK BmQJLv+Xbt94h9W+48v604k7grc2dRXYrxv09F0H3YSt/XySFH21+nKef0gqKx7VmcdGGKGrwJMS3Y qU6WTEQDgRx6tfhHtERGt7yzPFs2qC2QhFrtPi0FycomgQ0OFx+mAPbvCDOqcdt+bfxHGIytcKzeML 4dMi0i9fho6nPQf9NzpkZLdQ7cFai0TeInhYZaEIVkp1ACS9cg8bwF8UXzRU+wQJkNyYMT2HMkaSTm Iafs+uEtMGQOgvZxQyfNf8jNBMiR8v 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- Alternatively it would be possible to just pass i2c->name to mma7455_core_probe(). That's a simpler patch but that changes things in case id == NULL, so I didn't do that here even though it might be considered an improvement. --- drivers/iio/accel/mma7455_i2c.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/iio/accel/mma7455_i2c.c b/drivers/iio/accel/mma7455_i2c.c index c63b321b01cd..9518bd81f9e5 100644 --- a/drivers/iio/accel/mma7455_i2c.c +++ b/drivers/iio/accel/mma7455_i2c.c @@ -10,9 +10,16 @@ #include "mma7455.h" -static int mma7455_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static const struct i2c_device_id mma7455_i2c_ids[] = { + { "mma7455", 0 }, + { "mma7456", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, mma7455_i2c_ids); + +static int mma7455_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_match_id(mma7455_i2c_ids, i2c); struct regmap *regmap; const char *name = NULL; @@ -31,13 +38,6 @@ static void mma7455_i2c_remove(struct i2c_client *i2c) mma7455_core_remove(&i2c->dev); } -static const struct i2c_device_id mma7455_i2c_ids[] = { - { "mma7455", 0 }, - { "mma7456", 0 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, mma7455_i2c_ids); - static const struct of_device_id mma7455_of_match[] = { { .compatible = "fsl,mma7455" }, { .compatible = "fsl,mma7456" }, @@ -46,7 +46,7 @@ static const struct of_device_id mma7455_of_match[] = { MODULE_DEVICE_TABLE(of, mma7455_of_match); static struct i2c_driver mma7455_i2c_driver = { - .probe = mma7455_i2c_probe, + .probe_new = mma7455_i2c_probe, .remove = mma7455_i2c_remove, .id_table = mma7455_i2c_ids, .driver = { From patchwork Sun Oct 23 13:22:53 2022 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: 13016258 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 50944ECAAA1 for ; Sun, 23 Oct 2022 13:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230457AbiJWNXh (ORCPT ); Sun, 23 Oct 2022 09:23:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230468AbiJWNXc (ORCPT ); Sun, 23 Oct 2022 09:23:32 -0400 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 2DFDC6F27A for ; Sun, 23 Oct 2022 06:23:31 -0700 (PDT) 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 1omawZ-0006ri-5K; Sun, 23 Oct 2022 15:23:11 +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 1omawY-000yh7-E5; Sun, 23 Oct 2022 15:23:10 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawX-00A3RT-Hb; Sun, 23 Oct 2022 15:23:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Dmitry Torokhov , Vladimir Oltean , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 14/23] iio: accel: mma7660: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:53 +0200 Message-Id: <20221023132302.911644-15-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1050; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=CRtotGYhzACBZ+4+U7YqIeeEW/cmInGqjuAg4qsRL84=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9seXj0XA8dj30QiRlGizm58qR30LGbV1dVjhvJ PD4H3nSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/bAAKCRDB/BR4rcrsCUesB/ kByEGpIlkah2ddYttAXPFolHnJYl7vKCbJC6gKjnmTmFBzA3SGBsnl/BZ2tTfxWZ23/q3SFtfeTqQJ sj2y91LBL03dO1TZtAKTb7elOnKoGYqREMcuUJaXDhxhl4VujAJQhJj7mTeXf6odp3tlHox/U7NIht Yw02SwrbfgWKWQlt03jtPqgL3aSssEpt4J7D9q9158vpz4TT57VN26sePFfknJoRmDY4otyuf9rCrb MfWOjn4rso/zUZomZXUPvqFlRZdcul/cqNLooJgnMnqbhD/3j+61NoPsYVBe/VIZdX8/Jl4f73ldPE 3DHjWfJ+9Rdikd9ZS7nYJeozJBQtTd 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mma7660.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c index 85829990bbad..b279ca4dcdc0 100644 --- a/drivers/iio/accel/mma7660.c +++ b/drivers/iio/accel/mma7660.c @@ -169,8 +169,7 @@ static const struct iio_info mma7660_info = { .attrs = &mma7660_attribute_group, }; -static int mma7660_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mma7660_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -267,7 +266,7 @@ static struct i2c_driver mma7660_driver = { .of_match_table = mma7660_of_match, .acpi_match_table = mma7660_acpi_id, }, - .probe = mma7660_probe, + .probe_new = mma7660_probe, .remove = mma7660_remove, .id_table = mma7660_i2c_id, }; From patchwork Sun Oct 23 13:22:54 2022 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: 13016250 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 30CCCECAAA1 for ; Sun, 23 Oct 2022 13:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230483AbiJWNXe (ORCPT ); Sun, 23 Oct 2022 09:23:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230378AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 114A66F27A for ; Sun, 23 Oct 2022 06:23:29 -0700 (PDT) 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 1omawZ-0006s1-Tf; Sun, 23 Oct 2022 15:23:11 +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 1omawZ-000yhH-0B; Sun, 23 Oct 2022 15:23:11 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawX-00A3RW-Ps; Sun, 23 Oct 2022 15:23:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Hans de Goede , Haibo Chen , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 15/23] iio: accel: mma8452: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:54 +0200 Message-Id: <20221023132302.911644-16-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2143; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=bWa3Ctf92eeJrieS4pWQzl57MTSahKKbQ+jv4KxAgLw=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT9vDh5q13U3eGd/jKd3TXMZ7W4nc5ok9lq4HCPn a1GKUWmJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/bwAKCRDB/BR4rcrsCeNUB/ 40a0cCFILp7e3AmexftzQNvnjaNXM/ExAeDAl0mqoZBKsoETShPldsHurTphAI1Vu7m1Eos3nXMmTr ovccbttx9bXQ0cTr8uEF3Cxzo4J2PvdHHwG3fus7NSghzZ5SfAobkmAYfblePbxZZ0+nN2s+x6vNsw qfoiN4Dnxn+FWTtS/fKMHYNVbNZCXMvhGalqj757Z3uOfjkjYqdZiycTr8YXx5pVJpD0IQ5ptJjdc3 GUJORQ/q0LA2kneYkdsSlHsxPzxA7jA34hZLAGTSzVL5UUPv2vHuik+XWKboJNXzhWW7OvaPf0eJjy JaULv/hSijeKIkrVtiGbI4l73qg8h7 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mma8452.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 3ba28c2ff68a..2ce13c051363 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -1545,8 +1545,18 @@ static const struct of_device_id mma8452_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, mma8452_dt_ids); -static int mma8452_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id mma8452_id[] = { + { "mma8451", mma8451 }, + { "mma8452", mma8452 }, + { "mma8453", mma8453 }, + { "mma8652", mma8652 }, + { "mma8653", mma8653 }, + { "fxls8471", fxls8471 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, mma8452_id); + +static int mma8452_probe(struct i2c_client *client) { struct mma8452_data *data; struct iio_dev *indio_dev; @@ -1562,6 +1572,7 @@ static int mma8452_probe(struct i2c_client *client, data->chip_info = device_get_match_data(&client->dev); if (!data->chip_info) { + const struct i2c_device_id *id = i2c_match_id(mma8452_id, client); if (id) { data->chip_info = &mma_chip_info_table[id->driver_data]; } else { @@ -1829,24 +1840,13 @@ static const struct dev_pm_ops mma8452_pm_ops = { mma8452_runtime_resume, NULL) }; -static const struct i2c_device_id mma8452_id[] = { - { "mma8451", mma8451 }, - { "mma8452", mma8452 }, - { "mma8453", mma8453 }, - { "mma8652", mma8652 }, - { "mma8653", mma8653 }, - { "fxls8471", fxls8471 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, mma8452_id); - static struct i2c_driver mma8452_driver = { .driver = { .name = "mma8452", .of_match_table = mma8452_dt_ids, .pm = &mma8452_pm_ops, }, - .probe = mma8452_probe, + .probe_new = mma8452_probe, .remove = mma8452_remove, .id_table = mma8452_id, }; From patchwork Sun Oct 23 13:22:55 2022 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: 13016262 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 D7A44FA373F for ; Sun, 23 Oct 2022 13:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230482AbiJWNXl (ORCPT ); Sun, 23 Oct 2022 09:23:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbiJWNXe (ORCPT ); Sun, 23 Oct 2022 09:23:34 -0400 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 79A566FC4A for ; Sun, 23 Oct 2022 06:23:33 -0700 (PDT) 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 1omawb-0006yL-2t; Sun, 23 Oct 2022 15:23:13 +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 1omawZ-000yhU-MH; Sun, 23 Oct 2022 15:23:11 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawX-00A3Ra-W3; Sun, 23 Oct 2022 15:23:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Peter Rosin , Maximilian Luz , Miaoqian Lin , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 16/23] iio: accel: mma9551: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:55 +0200 Message-Id: <20221023132302.911644-17-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1670; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=S9AlV+kyx6oIrLd9f7ye+Lmvnmf93OpnPVzwUoz29ik=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT94sMzdu7QKeUMXGH+TNnYk4xeFuN2Ye+exZZtG DwrNgM+JATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/eAAKCRDB/BR4rcrsCWVdB/ 4i/ud+4GBIFuMNql+sWQmC/yTYottHwJbRllZmBtPS09eoluWm69/7J3Xvn3zE9x8QIse4ILxYpoOb YufV3NsC+Xy+Yrh8Ac9N3xeLmzmtOcmk7BnuqKuqbJUhdX+43MZ/CSJw9K0l9abssyXbG/Kx2kmv5R B+dymdZ2DNzLUbb1EEBtDN/seTuSaF6TsKw9uh3/ljSzc5wUy2h5QOFPrUWIKzrwPxVH1dR6mPftij cl9rTPpJo9DwH3psmIWvh8Wmw25TMF39A0PlWDEmZI17Ws4eujhj2P3r4FfVOpGVawGuUywiPuyKri TXEvBYAwhGYfZG4z8L/Zl+83ODkULp 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mma9551.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index f7a793f4a8e3..f7c72e8d9fb8 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -446,9 +446,15 @@ static const char *mma9551_match_acpi_device(struct device *dev) return dev_name(dev); } -static int mma9551_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static const struct i2c_device_id mma9551_id[] = { + {"mma9551", 0}, + {} +}; +MODULE_DEVICE_TABLE(i2c, mma9551_id); + +static int mma9551_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(mma9551_id, client); struct mma9551_data *data; struct iio_dev *indio_dev; const char *name = NULL; @@ -594,20 +600,13 @@ static const struct acpi_device_id mma9551_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, mma9551_acpi_match); -static const struct i2c_device_id mma9551_id[] = { - {"mma9551", 0}, - {} -}; - -MODULE_DEVICE_TABLE(i2c, mma9551_id); - static struct i2c_driver mma9551_driver = { .driver = { .name = MMA9551_DRV_NAME, .acpi_match_table = ACPI_PTR(mma9551_acpi_match), .pm = pm_ptr(&mma9551_pm_ops), }, - .probe = mma9551_probe, + .probe_new = mma9551_probe, .remove = mma9551_remove, .id_table = mma9551_id, }; From patchwork Sun Oct 23 13:22:56 2022 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: 13016264 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 51B75C433FE for ; Sun, 23 Oct 2022 13:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230355AbiJWNXl (ORCPT ); Sun, 23 Oct 2022 09:23:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230477AbiJWNXe (ORCPT ); Sun, 23 Oct 2022 09:23:34 -0400 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 AD40B6FC51 for ; Sun, 23 Oct 2022 06:23:33 -0700 (PDT) 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 1omawb-0006yB-03; Sun, 23 Oct 2022 15:23:13 +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 1omawZ-000yhT-M2; Sun, 23 Oct 2022 15:23:11 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawY-00A3Re-6l; Sun, 23 Oct 2022 15:23:10 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Peter Senna Tschudin , Hans Verkuil , Miaoqian Lin , Antoniu Miclaus , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 17/23] iio: accel: mma9553: Convert to i2c's .probe_new Date: Sun, 23 Oct 2022 15:22:56 +0200 Message-Id: <20221023132302.911644-18-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1713; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=yJ2HAm0fwDVaQvfFsnkon255fKUr7LSRo6Qj+PA7AJU=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+HkV69BldzBCE8Dw4MTiXsBFdQp3jKA2Q6bZiM ErbnFiSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/hwAKCRDB/BR4rcrsCRL6B/ 0VKcXrpKeh/JfXfAkWg5j64HckR6HPRbLHspAqIt4UicSVHZ62VkUiIwf88+KymtC1rpvQV24KOuaf XLaKQ+saqaBPiSVlQjqCNgs0lj1G6iMgz9mDiEogkwRD9QFsnE2CkQZKgiyRK8qjEwDpiMtovRsnAF 0RlQERwZPxyYndvIt6B4YefYVbfL0gcBTrDkz1mtmn8LVidSuvENNUzls0J5GxsGMb/cOBI/1dhVvp n7yDEa7nG6O6CMCGmfXMr2rUq4M7HZ7pX13njMsxBZTN5FxxZuBzHXzfByKRtiYYTyeA12fYeVXkJh hvN5Hm0NJU2SXz9Fa+VcNl61j8d9gS 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in .probe(). The device_id array has to move up for that to work. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mma9553.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c index 2da0e005b13e..0aa6f2092108 100644 --- a/drivers/iio/accel/mma9553.c +++ b/drivers/iio/accel/mma9553.c @@ -1073,9 +1073,16 @@ static const char *mma9553_match_acpi_device(struct device *dev) return dev_name(dev); } -static int mma9553_probe(struct i2c_client *client, - const struct i2c_device_id *id) + +static const struct i2c_device_id mma9553_id[] = { + {"mma9553", 0}, + {}, +}; +MODULE_DEVICE_TABLE(i2c, mma9553_id); + +static int mma9553_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(mma9553_id, client); struct mma9553_data *data; struct iio_dev *indio_dev; const char *name = NULL; @@ -1230,23 +1237,15 @@ static const struct acpi_device_id mma9553_acpi_match[] = { {"MMA9553", 0}, {}, }; - MODULE_DEVICE_TABLE(acpi, mma9553_acpi_match); -static const struct i2c_device_id mma9553_id[] = { - {"mma9553", 0}, - {}, -}; - -MODULE_DEVICE_TABLE(i2c, mma9553_id); - static struct i2c_driver mma9553_driver = { .driver = { .name = MMA9553_DRV_NAME, .acpi_match_table = ACPI_PTR(mma9553_acpi_match), .pm = pm_ptr(&mma9553_pm_ops), }, - .probe = mma9553_probe, + .probe_new = mma9553_probe, .remove = mma9553_remove, .id_table = mma9553_id, }; From patchwork Sun Oct 23 13:22:57 2022 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: 13016252 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 00224FA373F for ; Sun, 23 Oct 2022 13:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230451AbiJWNXf (ORCPT ); Sun, 23 Oct 2022 09:23:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 622F56F56C for ; Sun, 23 Oct 2022 06:23:29 -0700 (PDT) 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 1omawa-0006vp-JK; Sun, 23 Oct 2022 15:23:12 +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 1omawZ-000yhO-Dn; Sun, 23 Oct 2022 15:23:11 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawY-00A3Ri-Dk; Sun, 23 Oct 2022 15:23:10 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Dmitry Rokosov , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 18/23] iio: accel: mxc4005: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:57 +0200 Message-Id: <20221023132302.911644-19-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1023; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=Kz2hpwDyICoZsQNdqlmd+QKs2GlcWENpGtSotzVGTEs=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+L4kpEQFPPrNP8YTaJB2X744SNyS1Wuh7ycJMe 3PG/lY+JATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/iwAKCRDB/BR4rcrsCbaaB/ 9qabwUrhAM8fgN1Veipz5RcA0Xgu2osEKG3ENTzBuBQ5FXV7LMhzm3CaVFFMTwC//8xRJt5Oe07UAR o+qqEjfVhk4imcuPTHr4iBB8lfQgC44piqH5mtbZJpdy2EaEW/JqRT9flz4cvMEQzX2Iwn2SUSDHzH no/jYhBVnk6zbDa/g5F5zkMBPS/EKG0LOcv9RykE9cKnromMCr38Num/JnWcHTCuOWBs0fKz5axZZf 2Yd9W1OBdTC0RYhVFQ6klft5NqMqOfsrj4mTSQ1GsEdvv4j7gMoaJEozY4tIwlSq32JA8GtT3GJWFZ 3q6xjEReQEUWjgcn73u5bGI+LbzSpq 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mxc4005.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c index df600d2917c0..b146fc82738f 100644 --- a/drivers/iio/accel/mxc4005.c +++ b/drivers/iio/accel/mxc4005.c @@ -385,8 +385,7 @@ static int mxc4005_chip_init(struct mxc4005_data *data) return 0; } -static int mxc4005_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mxc4005_probe(struct i2c_client *client) { struct mxc4005_data *data; struct iio_dev *indio_dev; @@ -489,7 +488,7 @@ static struct i2c_driver mxc4005_driver = { .name = MXC4005_DRV_NAME, .acpi_match_table = ACPI_PTR(mxc4005_acpi_match), }, - .probe = mxc4005_probe, + .probe_new = mxc4005_probe, .id_table = mxc4005_id, }; From patchwork Sun Oct 23 13:22:58 2022 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: 13016247 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 675D8C433FE for ; Sun, 23 Oct 2022 13:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230459AbiJWNXb (ORCPT ); Sun, 23 Oct 2022 09:23:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230421AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 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 00F2D6FC4A for ; Sun, 23 Oct 2022 06:23:27 -0700 (PDT) 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 1omawb-00071e-E6; Sun, 23 Oct 2022 15:23:13 +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 1omawa-000yhm-Fs; Sun, 23 Oct 2022 15:23:12 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawY-00A3Rm-Jh; Sun, 23 Oct 2022 15:23:10 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 19/23] iio: accel: mxc6255: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:58 +0200 Message-Id: <20221023132302.911644-20-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1059; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=Y7ce1pV7EnM1dRLT3xI6AVuwYLbTY0ewHvg0g9pegL0=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMSSH2k8wuizdxNoqdK5PSjP75/nNztnMXyx/sygfUnkru/4r x8rbnYzGLAyMXAyyYoosdUVaYhMk1vy3K1nCDTOIlQlkCgMXpwBMZPV89v9lZwwumEgZ1Cw9e3Rx4W vJlxHJnmZPVn6UKf+/6OkMRem8fMnkrl/vqnpyHzpo/T2R7qAr+76F48rnMPVZN/ufRD7fGnT6vL33 1ZLia4lC0480fXTh13jnIfnzM/v3jMW+szwK+h6US2S9PlXTqZ8Raap+TdnodNW9r0KSooFFvc28T8 L/B7wQW5aWIXhoGR/vwiy1hLlWsQ8zUpaxbPCapVuo8eRi2a7E3n1iJ/ya3CNfFkboiXolmIq8C/qn mvxj1evV++rU3OP4Hqa9sjZ7Idr9wllWLVEj1c9W7d0W/fi7p27FJObue7DT07I7pvVl0c8mizqrGH afmflbZ20Q1RF4+tc4/ryufaYdAA== 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/mxc6255.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mxc6255.c b/drivers/iio/accel/mxc6255.c index 9aeeadc420d3..aa2e660545f8 100644 --- a/drivers/iio/accel/mxc6255.c +++ b/drivers/iio/accel/mxc6255.c @@ -113,8 +113,7 @@ static const struct regmap_config mxc6255_regmap_config = { .readable_reg = mxc6255_is_readable_reg, }; -static int mxc6255_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mxc6255_probe(struct i2c_client *client) { struct mxc6255_data *data; struct iio_dev *indio_dev; @@ -184,7 +183,7 @@ static struct i2c_driver mxc6255_driver = { .name = MXC6255_DRV_NAME, .acpi_match_table = ACPI_PTR(mxc6255_acpi_match), }, - .probe = mxc6255_probe, + .probe_new = mxc6255_probe, .id_table = mxc6255_id, }; From patchwork Sun Oct 23 13:22:59 2022 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: 13016254 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 C501CFA3741 for ; Sun, 23 Oct 2022 13:23:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230453AbiJWNXg (ORCPT ); Sun, 23 Oct 2022 09:23:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbiJWNXb (ORCPT ); Sun, 23 Oct 2022 09:23:31 -0400 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 7DEBA71726 for ; Sun, 23 Oct 2022 06:23:30 -0700 (PDT) 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 1omawb-000700-97; Sun, 23 Oct 2022 15:23:13 +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 1omawa-000yhc-0N; Sun, 23 Oct 2022 15:23:12 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawY-00A3Rq-Oz; Sun, 23 Oct 2022 15:23:10 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Jean Delvare , Gwendal Grignou , Peter Rosin , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 20/23] iio: accel: stk8312: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:22:59 +0200 Message-Id: <20221023132302.911644-21-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1108; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=PM5/Dm1kk3LHWe/wcBSCpCscaBmSwFmVDkwGKTWOvGs=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+TcbfQtmHVte2w/m+Bc3FsUb7w6uIhoUPVpK0U Q7uByraJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/kwAKCRDB/BR4rcrsCRe6CA CWUGy1/Tq3fuUZm3x1NlAjvieRH0fqKwMwppdqHCCKD6YhCFAdHHF2ttYPqq3scezWnZ9NzE9YoBFC fp/Q5cgqEzmMbpduV8NCPq0ZS36OOpH4Hh8E7OL2D9i2mFGn/ja0Fj6YltIlxdzYlEt0CuzFCi1SXm XZ1iZYFQwkqU+oH/SZo6XN0bRMflZxTkoOtUsYp7biGo07gdZkXpms8FP1INI+ZMhVcSqDb5xuhERN X+5KXTCPdLh4/02EnyH4SwNeiHJG88rdc6CIrUi8eI3hw/c3GGBZUFyl9lGko4FXc1Q/vbyLlOSRkY cFe4YgSshUv8hIVjOq+lj4uVcmVeEt 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/stk8312.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c index 7b1d6fb692b3..68f680db7505 100644 --- a/drivers/iio/accel/stk8312.c +++ b/drivers/iio/accel/stk8312.c @@ -498,8 +498,7 @@ static const struct iio_buffer_setup_ops stk8312_buffer_setup_ops = { .postdisable = stk8312_buffer_postdisable, }; -static int stk8312_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int stk8312_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -645,7 +644,7 @@ static struct i2c_driver stk8312_driver = { .name = STK8312_DRIVER_NAME, .pm = pm_sleep_ptr(&stk8312_pm_ops), }, - .probe = stk8312_probe, + .probe_new = stk8312_probe, .remove = stk8312_remove, .id_table = stk8312_i2c_id, }; From patchwork Sun Oct 23 13:23:00 2022 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: 13016263 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 B1436FA3740 for ; Sun, 23 Oct 2022 13:23:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230265AbiJWNXm (ORCPT ); Sun, 23 Oct 2022 09:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230474AbiJWNXf (ORCPT ); Sun, 23 Oct 2022 09:23:35 -0400 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 1256A6F27A for ; Sun, 23 Oct 2022 06:23:35 -0700 (PDT) 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 1omawb-0006z9-I3; Sun, 23 Oct 2022 15:23:13 +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 1omawZ-000yhZ-Qj; Sun, 23 Oct 2022 15:23:11 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawY-00A3Rt-Vl; Sun, 23 Oct 2022 15:23:10 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , Andy Shevchenko , Sebastian Reichel , Peter Rosin , Gwendal Grignou , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 21/23] iio: accel: stk8ba50: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:23:00 +0200 Message-Id: <20221023132302.911644-22-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1143; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=blqSJR1vQED6Phwn6GV3cYhB15BBqwEbzJcH3mrSz5E=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+X5yIWA83Sw2ZcGVuWDbWlf+mkxbUH1ecRsEcF WXfQRbqJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/lwAKCRDB/BR4rcrsCS4FB/ wLIsvAW7DPrraBCEMmv/Pu0D4uEUXdptk7qbGi3XgUeJO7jZDEz1fOHZHukBGyNY8Hb2AMFe+d4r48 feNIWS3ZcMPIOvh55sXDpIg7H5NA0ofOk8fVJRCDtyJ+Z8ZkpwMvCOVy0oCoI5BUmAck7UDnK8rLjO j7Km+lWRjbt4XfYlGceSDEQRr7nT3BF+ybN+Uw6FFJEKCoGejfAK91j3+DwYDlBcMvDBgbuttA06Ix v69czAP8WGdWgexYarCAyYe6atfZv1iZ4bN8C7kGvLZ+nIJ6NKlY1SUE4O/12+YeUdcoq6iN9tvtde 9IJa/m8jQ9J/IwI0GSeNg4tpp8lGuI 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/accel/stk8ba50.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c index 2f5e4ab2a6e7..44f6e0fbdfcc 100644 --- a/drivers/iio/accel/stk8ba50.c +++ b/drivers/iio/accel/stk8ba50.c @@ -379,8 +379,7 @@ static const struct iio_buffer_setup_ops stk8ba50_buffer_setup_ops = { .postdisable = stk8ba50_buffer_postdisable, }; -static int stk8ba50_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int stk8ba50_probe(struct i2c_client *client) { int ret; struct iio_dev *indio_dev; @@ -544,7 +543,7 @@ static struct i2c_driver stk8ba50_driver = { .pm = pm_sleep_ptr(&stk8ba50_pm_ops), .acpi_match_table = ACPI_PTR(stk8ba50_acpi_id), }, - .probe = stk8ba50_probe, + .probe_new = stk8ba50_probe, .remove = stk8ba50_remove, .id_table = stk8ba50_i2c_id, }; From patchwork Sun Oct 23 13:23:01 2022 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: 13016246 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 32C2CFA373D for ; Sun, 23 Oct 2022 13:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230216AbiJWNX3 (ORCPT ); Sun, 23 Oct 2022 09:23:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230415AbiJWNX2 (ORCPT ); Sun, 23 Oct 2022 09:23:28 -0400 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 A2F336FA04 for ; Sun, 23 Oct 2022 06:23:27 -0700 (PDT) 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 1omawb-00070y-Gk; Sun, 23 Oct 2022 15:23:13 +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 1omawa-000yhj-9g; Sun, 23 Oct 2022 15:23:12 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawZ-00A3Rx-6I; Sun, 23 Oct 2022 15:23:11 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 22/23] iio: accel: st_magn: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:23:01 +0200 Message-Id: <20221023132302.911644-23-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1170; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=bzEQORsV7CC8iq735P333ifpo8EwBAep5rQS6r3vJy4=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+aGWOillPaMKPZlK6RuIR3iOqfQUoVexsfRg4P 7SWV39KJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/mgAKCRDB/BR4rcrsCelNB/ 95Z2PFFFsHU8IR4uT4upY7UPd42/sB01eRxCgTwkuUkWmtmKfKTR1p7udH7MQn0I6/036Yxeez8xtW m6r7T/D6NXSAIwRECqb5J0qsgx4rA2efCT6GCNAn1PKz9lIPwuol6km6I1qImiJ079ieGTqKnawSwO MquKfJ8/2FKopP/ImdqQmR5BohbBsa5CRJGdMT1seHK1opwMQ00qpIo+wt9nXkDCq3di10J5JXmEzs FjxFmVG9CRjwrKfrz2I7M50nUdjthN5HBEaflAaj7TYlobmhxnuZIpf7trqzq9yYLVvFL3UH76KUBt /5I9elgWxV7tA76y9aD1OQfQfghAKd 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/magnetometer/st_magn_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c index c5d8c303db4e..b4098d3b3813 100644 --- a/drivers/iio/magnetometer/st_magn_i2c.c +++ b/drivers/iio/magnetometer/st_magn_i2c.c @@ -54,8 +54,7 @@ static const struct of_device_id st_magn_of_match[] = { }; MODULE_DEVICE_TABLE(of, st_magn_of_match); -static int st_magn_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st_magn_i2c_probe(struct i2c_client *client) { const struct st_sensor_settings *settings; struct st_sensor_data *mdata; @@ -107,7 +106,7 @@ static struct i2c_driver st_magn_driver = { .name = "st-magn-i2c", .of_match_table = st_magn_of_match, }, - .probe = st_magn_i2c_probe, + .probe_new = st_magn_i2c_probe, .id_table = st_magn_id_table, }; module_i2c_driver(st_magn_driver); From patchwork Sun Oct 23 13:23:02 2022 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: 13016253 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 66DFCFA3740 for ; Sun, 23 Oct 2022 13:23:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230454AbiJWNXf (ORCPT ); Sun, 23 Oct 2022 09:23:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230453AbiJWNXa (ORCPT ); Sun, 23 Oct 2022 09:23:30 -0400 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 8222F6FA04 for ; Sun, 23 Oct 2022 06:23:29 -0700 (PDT) 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 1omawb-00070f-DX; Sun, 23 Oct 2022 15:23:13 +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 1omawa-000yhg-6w; Sun, 23 Oct 2022 15:23:12 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omawZ-00A3S0-CG; Sun, 23 Oct 2022 15:23:11 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Jonathan Cameron Cc: Wolfram Sang , Lars-Peter Clausen , linux-iio@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 23/23] iio: accel: vl6180: Convert to i2c's .probe_new() Date: Sun, 23 Oct 2022 15:23:02 +0200 Message-Id: <20221023132302.911644-24-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> References: <20221023132302.911644-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1014; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=Pyu9GPUX2p9YWM1nkSwKN+ShPzYSjJx9ergRFEi7B7A=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBjVT+dqWlN2K2zsUAeYOAo3+VSnx7CKBDCQ2g93GI1 ihfy4bWJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCY1U/nQAKCRDB/BR4rcrsCbhqB/ sHNs3S7+u3SEc50404NJKULsWhqCsaBSXf8mA1rIUoNCgTH5W1i50jol9VXyT+ZFZOdMnCNKh0wLC2 HkasqI/Nvwu3WlIro4rP5BefvX0dP01fMu9DY7p9eOobT7bvZPwA5VfXx4XavukiRP56BpBCXAC6YT dOYp3uH1TBsuIfzZhcmpbVLnbVJSbJQy7pVoJ+VnsJfMAMJ72KVJI7SvQoq9/apUoNE1fENwR9p7kL R08K+z3iWXfOldm+UNlvC2hffO8dQoRqvUsjlsoUq18r0Mt3r12D3/KO/U8X7ST16BjWS3Bq4NtFQb Xusxz/D8ohRjuchK9K1/M6oIhuo/tt 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: linux-iio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/iio/light/vl6180.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c index d47a4f6f4e87..8b56df26c59e 100644 --- a/drivers/iio/light/vl6180.c +++ b/drivers/iio/light/vl6180.c @@ -493,8 +493,7 @@ static int vl6180_init(struct vl6180_data *data) return vl6180_hold(data, false); } -static int vl6180_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int vl6180_probe(struct i2c_client *client) { struct vl6180_data *data; struct iio_dev *indio_dev; @@ -539,7 +538,7 @@ static struct i2c_driver vl6180_driver = { .name = VL6180_DRV_NAME, .of_match_table = vl6180_of_match, }, - .probe = vl6180_probe, + .probe_new = vl6180_probe, .id_table = vl6180_id, };