i2c: acpi: Drop double check for ACPI companion device
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 28 May 2020 14:18:58 +0000 (17:18 +0300)
committerWolfram Sang <wsa@kernel.org>
Thu, 28 May 2020 16:01:20 +0000 (18:01 +0200)
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>
drivers/i2c/i2c-core-acpi.c

index c8f42f2037cbe3c3d866bae030b76cbf14b2cfc4..2ade99b105b91e263aa14e0463a1098e844b25ce 100644 (file)
@@ -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);