diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-05-28 16:18:58 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-28 18:01:20 +0200 |
| commit | 3e34b5135b39c4d530494e08d56b12f5b1396aa6 (patch) | |
| tree | 826d88043900a21a892c83df646abb1e708d470e /drivers/i2c | |
| parent | i2c: nvidia-gpu: Use PTR_ERR_OR_ZERO() to simplify code (diff) | |
| download | linux-3e34b5135b39c4d530494e08d56b12f5b1396aa6.tar.xz linux-3e34b5135b39c4d530494e08d56b12f5b1396aa6.zip | |
i2c: acpi: Drop double check for ACPI companion device
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>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core-acpi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index c8f42f2037cb..2ade99b105b9 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -468,16 +468,12 @@ struct notifier_block i2c_acpi_notifier = { struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, struct i2c_board_info *info) { + struct acpi_device *adev = ACPI_COMPANION(dev); struct i2c_acpi_lookup lookup; struct i2c_adapter *adapter; - struct acpi_device *adev; LIST_HEAD(resource_list); int ret; - adev = ACPI_COMPANION(dev); - if (!adev) - return ERR_PTR(-EINVAL); - memset(&lookup, 0, sizeof(lookup)); lookup.info = info; lookup.device_handle = acpi_device_handle(adev); |