| Message ID | 20200528141552.57504-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] iio: imu: inv_mpu6050: Drop double check for ACPI companion device | expand |
On Thu, 28 May 2020 17:15:52 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > acpi_dev_get_resources() does perform the NULL pointer check against > ACPI companion device which is given as function parameter. Thus, > there is no need to duplicate this check in the caller. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 6 +----- > 1 file changed, 1 insertion(+), 5 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..bf9bdaf6519a 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c > @@ -101,8 +101,8 @@ static int inv_mpu_process_acpi_config(struct i2c_client *client, > unsigned short *primary_addr, > unsigned short *secondary_addr) > { > + struct acpi_device *adev = ACPI_COMPANION(&client->dev); > const struct acpi_device_id *id; > - struct acpi_device *adev; > u32 i2c_addr = 0; > LIST_HEAD(resources); > int ret; > @@ -112,10 +112,6 @@ static int inv_mpu_process_acpi_config(struct i2c_client *client, > if (!id) > return -ENODEV; > > - adev = ACPI_COMPANION(&client->dev); > - if (!adev) > - return -ENODEV; > - > ret = acpi_dev_get_resources(adev, &resources, > acpi_i2c_check_resource, &i2c_addr); > if (ret < 0)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c index 2f8560ba4572..bf9bdaf6519a 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c @@ -101,8 +101,8 @@ static int inv_mpu_process_acpi_config(struct i2c_client *client, unsigned short *primary_addr, unsigned short *secondary_addr) { + struct acpi_device *adev = ACPI_COMPANION(&client->dev); const struct acpi_device_id *id; - struct acpi_device *adev; u32 i2c_addr = 0; LIST_HEAD(resources); int ret; @@ -112,10 +112,6 @@ static int inv_mpu_process_acpi_config(struct i2c_client *client, if (!id) return -ENODEV; - adev = ACPI_COMPANION(&client->dev); - if (!adev) - return -ENODEV; - ret = acpi_dev_get_resources(adev, &resources, acpi_i2c_check_resource, &i2c_addr); if (ret < 0)
acpi_dev_get_resources() does perform the NULL pointer check against ACPI companion device which is given as function parameter. Thus, there is no need to duplicate this check in the caller. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)