Commit 0c2a3493 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang

i2c: revert "i2c: core: Allow drivers to disable i2c-core irq mapping"

This manually reverts commit d1d84bb9.
The only user has gone two years ago with commit 589edb56 ("ACPI /
scan: Create platform device for INT33FE ACPI nodes") and no new user
has showed up. Remove and hope we will never need it again.
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 58031a26
...@@ -319,11 +319,9 @@ static int i2c_device_probe(struct device *dev) ...@@ -319,11 +319,9 @@ static int i2c_device_probe(struct device *dev)
if (!client) if (!client)
return 0; return 0;
driver = to_i2c_driver(dev->driver);
client->irq = client->init_irq; client->irq = client->init_irq;
if (!client->irq && !driver->disable_i2c_core_irq_mapping) { if (!client->irq) {
int irq = -ENOENT; int irq = -ENOENT;
if (client->flags & I2C_CLIENT_HOST_NOTIFY) { if (client->flags & I2C_CLIENT_HOST_NOTIFY) {
...@@ -349,6 +347,8 @@ static int i2c_device_probe(struct device *dev) ...@@ -349,6 +347,8 @@ static int i2c_device_probe(struct device *dev)
client->irq = irq; client->irq = irq;
} }
driver = to_i2c_driver(dev->driver);
/* /*
* An I2C ID table is not mandatory, if and only if, a suitable OF * An I2C ID table is not mandatory, if and only if, a suitable OF
* or ACPI ID table is supplied for the probing device. * or ACPI ID table is supplied for the probing device.
......
...@@ -231,7 +231,6 @@ enum i2c_alert_protocol { ...@@ -231,7 +231,6 @@ enum i2c_alert_protocol {
* @detect: Callback for device detection * @detect: Callback for device detection
* @address_list: The I2C addresses to probe (for detect) * @address_list: The I2C addresses to probe (for detect)
* @clients: List of detected clients we created (for i2c-core use only) * @clients: List of detected clients we created (for i2c-core use only)
* @disable_i2c_core_irq_mapping: Tell the i2c-core to not do irq-mapping
* *
* The driver.owner field should be set to the module owner of this driver. * The driver.owner field should be set to the module owner of this driver.
* The driver.name field should be set to the name of this driver. * The driver.name field should be set to the name of this driver.
...@@ -290,8 +289,6 @@ struct i2c_driver { ...@@ -290,8 +289,6 @@ struct i2c_driver {
int (*detect)(struct i2c_client *client, struct i2c_board_info *info); int (*detect)(struct i2c_client *client, struct i2c_board_info *info);
const unsigned short *address_list; const unsigned short *address_list;
struct list_head clients; struct list_head clients;
bool disable_i2c_core_irq_mapping;
}; };
#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver) #define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment