Commit af3b462a authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

gpiolib: acpi: Move ACPI device NULL check to acpi_get_driver_gpio_data() 



It's logical to check ACPI device for NULL inside
acpi_get_driver_gpio_data() instead of requiring that
in each caller.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 5062e4c1

drivers/gpio/gpiolib-acpi.c

+4 −7
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static bool acpi_get_driver_gpio_data(struct acpi_device *adev, 
{

	const struct acpi_gpio_mapping *gm;



	if (!adev->driver_gpios)

	if (!adev || !adev->driver_gpios)

		return false;



	for (gm = adev->driver_gpios; gm->name; gm++)
@@ -839,13 +839,10 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode, 
	ret = __acpi_node_get_property_reference(fwnode, propname, index, 3,

						 &args);

	if (ret) {

		struct acpi_device *adev = to_acpi_device_node(fwnode);



		if (!adev)

			return ret;

		struct acpi_device *adev;



		if (!acpi_get_driver_gpio_data(adev, propname, index, &args,

					       &quirks))

		adev = to_acpi_device_node(fwnode);

		if (!acpi_get_driver_gpio_data(adev, propname, index, &args, &quirks))

			return ret;

	}

	/*