From: Uwe Kleine-König <[email protected]>
.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 <[email protected]>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 7a8d60a5afa9..70eaa408e388 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -95,9 +95,9 @@ static int inv_mpu_i2c_aux_setup(struct iio_dev *indio_dev)
*
* Returns 0 on success, a negative error code otherwise.
*/
-static int inv_mpu_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int inv_mpu_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
const void *match;
struct inv_mpu6050_state *st;
int result;
@@ -260,7 +260,7 @@ static const struct acpi_device_id inv_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
static struct i2c_driver inv_mpu_driver = {
- .probe = inv_mpu_probe,
+ .probe_new = inv_mpu_probe,
.remove = inv_mpu_remove,
.id_table = inv_mpu_id,
.driver = {
--
2.38.1
Hello,
looks good, thanks for the patch.
Acked-by: Jean-Baptiste Maneyrol <[email protected]>
Best regards,
JB
From: Uwe Kleine-K?nig <[email protected]>
Sent: Friday, November 18, 2022 23:37
To: Angel Iglesias <[email protected]>; Lee Jones <[email protected]>; Grant Likely <[email protected]>; Wolfram Sang <[email protected]>; Jonathan Cameron <[email protected]>; Andy Shevchenko <[email protected]>; Jean-Baptiste Maneyrol <[email protected]>; Hans Verkuil <[email protected]>; Michael Srba <[email protected]>
Cc: [email protected] <[email protected]>; [email protected] <[email protected]>; Uwe Kleine-K?nig <[email protected]>; Lars-Peter Clausen <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>
Subject: [PATCH 109/606] iio: imu: inv_mpu6050: Convert to i2c's .probe_new()
?
[CAUTION] This is an EXTERNAL email. Do not click links or open attachments unless you recognize the sender and know the content is safe.
======================================================================
From: Uwe Kleine-K?nig <[email protected]>
.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 <[email protected]>
---
?drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +++---
?1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 7a8d60a5afa9..70eaa408e388 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -95,9 +95,9 @@ static int inv_mpu_i2c_aux_setup(struct iio_dev *indio_dev)
? *
? *? Returns 0 on success, a negative error code otherwise.
? */
-static int inv_mpu_probe(struct i2c_client *client,
-??????????????????????? const struct i2c_device_id *id)
+static int inv_mpu_probe(struct i2c_client *client)
?{
+?????? const struct i2c_device_id *id = i2c_client_get_device_id(client);
???????? const void *match;
???????? struct inv_mpu6050_state *st;
???????? int result;
@@ -260,7 +260,7 @@ static const struct acpi_device_id inv_acpi_match[] = {
?MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
?
?static struct i2c_driver inv_mpu_driver = {
-?????? .probe????????? =?????? inv_mpu_probe,
+?????? .probe_new????? =?????? inv_mpu_probe,
???????? .remove???????? =?????? inv_mpu_remove,
???????? .id_table?????? =?????? inv_mpu_id,
???????? .driver = {
--
2.38.1
On Fri, 18 Nov 2022 23:37:23 +0100
Uwe Kleine-König <[email protected]> wrote:
> From: Uwe Kleine-König <[email protected]>
>
> .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 <[email protected]>
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> index 7a8d60a5afa9..70eaa408e388 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
> @@ -95,9 +95,9 @@ static int inv_mpu_i2c_aux_setup(struct iio_dev *indio_dev)
> *
Kernel-doc (no idea why it needs it for a probe function) has
id documented. I've fixed up dropping that.
Jonathan
> * Returns 0 on success, a negative error code otherwise.
> */
> -static int inv_mpu_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int inv_mpu_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
> const void *match;
> struct inv_mpu6050_state *st;
> int result;
> @@ -260,7 +260,7 @@ static const struct acpi_device_id inv_acpi_match[] = {
> MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
>
> static struct i2c_driver inv_mpu_driver = {
> - .probe = inv_mpu_probe,
> + .probe_new = inv_mpu_probe,
> .remove = inv_mpu_remove,
> .id_table = inv_mpu_id,
> .driver = {