| Message ID | 1430908148-201129-3-git-send-email-mika.westerberg@linux.intel.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Wed, May 6, 2015 at 12:29 PM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > This is the convention used in most parts of the kernel including DT > counterpart of I2C slave enumeration. To make things consistent do the same > for ACPI I2C slave enumeration path as well. > > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> This needs to go through the GPIO tree along with 3/3. Wolfram, can I have your ACK on this patch? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 06, 2015 at 01:29:07PM +0300, Mika Westerberg wrote: > This is the convention used in most parts of the kernel including DT > counterpart of I2C slave enumeration. To make things consistent do the same > for ACPI I2C slave enumeration path as well. > > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Wolfram Sang <wsa@the-dreams.de>
On Wed, May 6, 2015 at 12:29 PM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > This is the convention used in most parts of the kernel including DT > counterpart of I2C slave enumeration. To make things consistent do the same > for ACPI I2C slave enumeration path as well. > > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Patch applied to the GPIO tree with Wolfram's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 987c124432c5..c21b3de70234 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -107,7 +107,7 @@ static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data) if (sb->access_mode == ACPI_I2C_10BIT_MODE) info->flags |= I2C_CLIENT_TEN; } - } else if (info->irq < 0) { + } else if (!info->irq) { struct resource r; if (acpi_dev_resource_interrupt(ares, 0, &r)) @@ -134,7 +134,6 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, memset(&info, 0, sizeof(info)); info.fwnode = acpi_fwnode_handle(adev); - info.irq = -1; INIT_LIST_HEAD(&resource_list); ret = acpi_dev_get_resources(adev, &resource_list,
This is the convention used in most parts of the kernel including DT counterpart of I2C slave enumeration. To make things consistent do the same for ACPI I2C slave enumeration path as well. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> --- drivers/i2c/i2c-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)