aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/i2c-core.c
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2015-05-06 06:29:07 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-05-13 04:23:22 -0400
commitdab472eb931bc2916fa779e56deccd0ec319cf5b (patch)
treecfa97bd0c628bb47afd785c0320f693abbe12d61 /drivers/i2c/i2c-core.c
parent8864afaa635be099c5c73a2f0d640a12e58f1d14 (diff)
i2c / ACPI: Use 0 to indicate that device does not have interrupt assigned
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>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r--drivers/i2c/i2c-core.c3
1 files changed, 1 insertions, 2 deletions
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)
107 if (sb->access_mode == ACPI_I2C_10BIT_MODE) 107 if (sb->access_mode == ACPI_I2C_10BIT_MODE)
108 info->flags |= I2C_CLIENT_TEN; 108 info->flags |= I2C_CLIENT_TEN;
109 } 109 }
110 } else if (info->irq < 0) { 110 } else if (!info->irq) {
111 struct resource r; 111 struct resource r;
112 112
113 if (acpi_dev_resource_interrupt(ares, 0, &r)) 113 if (acpi_dev_resource_interrupt(ares, 0, &r))
@@ -134,7 +134,6 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
134 134
135 memset(&info, 0, sizeof(info)); 135 memset(&info, 0, sizeof(info));
136 info.fwnode = acpi_fwnode_handle(adev); 136 info.fwnode = acpi_fwnode_handle(adev);
137 info.irq = -1;
138 137
139 INIT_LIST_HEAD(&resource_list); 138 INIT_LIST_HEAD(&resource_list);
140 ret = acpi_dev_get_resources(adev, &resource_list, 139 ret = acpi_dev_get_resources(adev, &resource_list,