linux-kernel - [PATCH 148/606] iio: light: vcnl4000: Convert to i2c's .probe

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 18 Nov 2022 23:38:02 +0100
From:   Uwe Kleine-König <uwe@...ine-koenig.org>
To:     Angel Iglesias <ang.iglesiasg@...il.com>,
        Lee Jones <lee.jones@...aro.org>,
        Grant Likely <grant.likely@...aro.org>,
        Wolfram Sang <wsa@...nel.org>,
        Jonathan Cameron <jic23@...nel.org>,
        Mårten Lindahl <marten.lindahl@...s.com>,
        Crt Mori <cmo@...exis.com>,
        Maximilian Luz <luzmaximilian@...il.com>
Cc:     linux-i2c@...r.kernel.org, kernel@...gutronix.de,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>,
        Lars-Peter Clausen <lars@...afoo.de>,
        linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 148/606] iio: light: vcnl4000: Convert to i2c's .probe_new()

From: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
---
 drivers/iio/light/vcnl4000.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index fdb3922ae4ac..cc1a2062e76d 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -1180,9 +1180,9 @@ static int vcnl4010_probe_trigger(struct iio_dev *indio_dev)
 	return devm_iio_trigger_register(&client->dev, trigger);
 }
 
-static int vcnl4000_probe(struct i2c_client *client,
-			  const struct i2c_device_id *id)
+static int vcnl4000_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct vcnl4000_data *data;
 	struct iio_dev *indio_dev;
 	int ret;
@@ -1326,7 +1326,7 @@ static struct i2c_driver vcnl4000_driver = {
 		.pm	= pm_ptr(&vcnl4000_pm_ops),
 		.of_match_table = vcnl_4000_of_match,
 	},
-	.probe  = vcnl4000_probe,
+	.probe_new = vcnl4000_probe,
 	.id_table = vcnl4000_id,
 	.remove	= vcnl4000_remove,
 };
-- 
2.38.1