Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2223ddc authored by Charles Keepax's avatar Charles Keepax Committed by Wolfram Sang
Browse files

i2c: acpi: Use available IRQ helper functions 



Use the available IRQ helper functions, most of the functions have
additional helpful side affects like configuring the trigger type of the
IRQ.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 1d7534b6

drivers/i2c/i2c-core-acpi.c

+13 −9
Original line number Diff line number Diff line
@@ -137,13 +137,23 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev, 
	return 0;

}



static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)

{

	int *irq = data;

	struct resource r;



	if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r))

		*irq = i2c_dev_irq_from_resources(&r, 1);



	return 1; /* No need to add resource to the list */

}



static int i2c_acpi_get_info(struct acpi_device *adev,

			     struct i2c_board_info *info,

			     struct i2c_adapter *adapter,

			     acpi_handle *adapter_handle)

{

	struct list_head resource_list;

	struct resource_entry *entry;

	struct i2c_acpi_lookup lookup;

	int ret;
@@ -176,17 +186,11 @@ static int i2c_acpi_get_info(struct acpi_device *adev, 


	/* Then fill IRQ number if any */

	INIT_LIST_HEAD(&resource_list);

	ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);

	ret = acpi_dev_get_resources(adev, &resource_list,

				     i2c_acpi_add_resource, &info->irq);

	if (ret < 0)

		return -EINVAL;



	resource_list_for_each_entry(entry, &resource_list) {

		if (resource_type(entry->res) == IORESOURCE_IRQ) {

			info->irq = entry->res->start;

			break;

		}

	}



	acpi_dev_free_resource_list(&resource_list);



	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,