]> git.baikalelectronics.ru Git - kernel.git/commitdiff
platform/x86: intel_cht_int33fe: Drop double check for ACPI companion device
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 26 May 2020 12:53:29 +0000 (15:53 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 9 Jul 2020 19:40:36 +0000 (22:40 +0300)
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/platform/x86/intel_cht_int33fe_common.c

index 42dd11623f5651fbe51661c0f5ce5390c95b8d1a..251ed9bac789114a161d517ddf797c99816bdf54 100644 (file)
@@ -29,18 +29,16 @@ static int cht_int33fe_i2c_res_filter(struct acpi_resource *ares, void *data)
 
 static int cht_int33fe_count_i2c_clients(struct device *dev)
 {
-       struct acpi_device *adev;
+       struct acpi_device *adev = ACPI_COMPANION(dev);
        LIST_HEAD(resource_list);
        int count = 0;
+       int ret;
 
-       adev = ACPI_COMPANION(dev);
-       if (!adev)
-               return -EINVAL;
-
-       acpi_dev_get_resources(adev, &resource_list,
-                              cht_int33fe_i2c_res_filter, &count);
-
+       ret = acpi_dev_get_resources(adev, &resource_list,
+                                    cht_int33fe_i2c_res_filter, &count);
        acpi_dev_free_resource_list(&resource_list);
+       if (ret < 0)
+               return ret;
 
        return count;
 }