gpiolib: acpi: Simplify error handling in __acpi_find_gpio()
Now that we don't perform anything on the GPIO descriptor, we may simplify the error path in newly introduced helper. Do it so. Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
@@ -974,20 +974,14 @@ __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int
|
||||
return ERR_CAST(desc);
|
||||
|
||||
if (!IS_ERR(desc))
|
||||
break;
|
||||
}
|
||||
|
||||
/* Then from plain _CRS GPIOs */
|
||||
if (IS_ERR(desc)) {
|
||||
if (!adev || !acpi_can_fallback_to_crs(adev, con_id))
|
||||
return ERR_PTR(-ENOENT);
|
||||
|
||||
desc = acpi_get_gpiod_by_index(adev, NULL, idx, info);
|
||||
if (IS_ERR(desc))
|
||||
return desc;
|
||||
}
|
||||
|
||||
return desc;
|
||||
/* Then from plain _CRS GPIOs */
|
||||
if (!adev || !acpi_can_fallback_to_crs(adev, con_id))
|
||||
return ERR_PTR(-ENOENT);
|
||||
|
||||
return acpi_get_gpiod_by_index(adev, NULL, idx, info);
|
||||
}
|
||||
|
||||
struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
|
||||
|
||||
Reference in New Issue
Block a user