We are deprecating calls which return NULL in favor of new variants which
return an ERR_PTR.
Wolfram Sang (1):
iio: imu: inv_mpu6050: convert to use i2c_new_client_device()
drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--
2.20.1
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
index 2f8560ba4572..c27d06035c8b 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
@@ -135,6 +135,7 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
st->mux_client = NULL;
if (ACPI_HANDLE(&client->dev)) {
struct i2c_board_info info;
+ struct i2c_client *mux_client;
struct acpi_device *adev;
int ret = -1;
@@ -172,9 +173,10 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
} else
return 0; /* no secondary addr, which is OK */
}
- st->mux_client = i2c_new_device(st->muxc->adapter[0], &info);
- if (!st->mux_client)
- return -ENODEV;
+ mux_client = i2c_new_client_device(st->muxc->adapter[0], &info);
+ if (IS_ERR(mux_client))
+ return PTR_ERR(mux_client);
+ st->mux_client = mux_client;
}
return 0;
--
2.20.1
Hello,
thanks for the patch.
Looks good for me.
Acked-by: Jean-Baptiste Maneyrol <[email protected]>
Best regards,
JB
From: [email protected] <[email protected]> on behalf of Wolfram Sang <[email protected]>
Sent: Thursday, March 26, 2020 22:09
To: [email protected] <[email protected]>
Cc: Wolfram Sang <[email protected]>; Jonathan Cameron <[email protected]>; Hartmut Knaack <[email protected]>; Lars-Peter Clausen <[email protected]>; Peter Meerwald-Stadler <[email protected]>; [email protected] <[email protected]>;
[email protected] <[email protected]>
Subject: [PATCH 1/1] iio: imu: inv_mpu6050: convert to use i2c_new_client_device()
?
?CAUTION: This email originated from outside of the organization. Please make sure the sender is who they say they are and do not click links or open attachments unless you recognize the sender and know the content is safe.
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <[email protected]>
---
?drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +++++---
?1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
index 2f8560ba4572..c27d06035c8b 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
@@ -135,6 +135,7 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
???????? st->mux_client = NULL;
???????? if (ACPI_HANDLE(&client->dev)) {
???????????????? struct i2c_board_info info;
+?????????????? struct i2c_client *mux_client;
???????????????? struct acpi_device *adev;
???????????????? int ret = -1;
?
@@ -172,9 +173,10 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
???????????????????????? } else
???????????????????????????????? return 0; /* no secondary addr, which is OK */
???????????????? }
-?????????????? st->mux_client = i2c_new_device(st->muxc->adapter[0], &info);
-?????????????? if (!st->mux_client)
-?????????????????????? return -ENODEV;
+?????????????? mux_client = i2c_new_client_device(st->muxc->adapter[0], &info);
+?????????????? if (IS_ERR(mux_client))
+?????????????????????? return PTR_ERR(mux_client);
+?????????????? st->mux_client = mux_client;
???????? }
?
???????? return 0;
--
2.20.1
On Fri, 27 Mar 2020 10:52:02 +0000
Jean-Baptiste Maneyrol <[email protected]> wrote:
> Hello,
>
> thanks for the patch.
> Looks good for me.
>
> Acked-by: Jean-Baptiste Maneyrol <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing.
Note this has missed the coming merge window. Hope that doesn't matter for your
deprecation plans.
Thanks,
Jonathan
>
> Best regards,
> JB
>
>
> From: [email protected] <[email protected]> on behalf of Wolfram Sang <[email protected]>
>
> Sent: Thursday, March 26, 2020 22:09
>
> To: [email protected] <[email protected]>
>
> Cc: Wolfram Sang <[email protected]>; Jonathan Cameron <[email protected]>; Hartmut Knaack <[email protected]>; Lars-Peter Clausen <[email protected]>; Peter Meerwald-Stadler <[email protected]>; [email protected] <[email protected]>;
> [email protected] <[email protected]>
>
> Subject: [PATCH 1/1] iio: imu: inv_mpu6050: convert to use i2c_new_client_device()
>
>
>
>
> CAUTION: This email originated from outside of the organization. Please make sure the sender is who they say they are and do not click links or open attachments unless you recognize the sender and know the content is safe.
>
>
>
> Move away from the deprecated API and return the shiny new ERRPTR where
>
> useful.
>
>
>
> Signed-off-by: Wolfram Sang <[email protected]>
>
> ---
>
> drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +++++---
>
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
>
> index 2f8560ba4572..c27d06035c8b 100644
>
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
>
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
>
> @@ -135,6 +135,7 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
>
> st->mux_client = NULL;
>
> if (ACPI_HANDLE(&client->dev)) {
>
> struct i2c_board_info info;
>
> + struct i2c_client *mux_client;
>
> struct acpi_device *adev;
>
> int ret = -1;
>
>
>
> @@ -172,9 +173,10 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)
>
> } else
>
> return 0; /* no secondary addr, which is OK */
>
> }
>
> - st->mux_client = i2c_new_device(st->muxc->adapter[0], &info);
>
> - if (!st->mux_client)
>
> - return -ENODEV;
>
> + mux_client = i2c_new_client_device(st->muxc->adapter[0], &info);
>
> + if (IS_ERR(mux_client))
>
> + return PTR_ERR(mux_client);
>
> + st->mux_client = mux_client;
>
> }
>
>
>
> return 0;
>
> Note this has missed the coming merge window. Hope that doesn't matter for your
> deprecation plans.
No worries. If I can remove it in the cycle after the next, I am happy.
Thanks!