i2c / ACPI: Use 0 to indicate that device does not have interrupt assigned
authorMika Westerberg <mika.westerberg@linux.intel.com>
Wed, 6 May 2015 10:29:07 +0000 (13:29 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 13 May 2015 08:23:22 +0000 (10:23 +0200)
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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/i2c/i2c-core.c

index 987c124432c501f7a5cabb83bdc638c0f337fcb7..c21b3de70234b9ecf155969a753692f1bec3738d 100644 (file)
@@ -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,