Skip to content

Commit

Permalink
i2c: revert "i2c: core: Allow drivers to disable i2c-core irq mapping"
Browse files Browse the repository at this point in the history
This manually reverts commit d1d84bb.
The only user has gone two years ago with commit 589edb5 ("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: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
  • Loading branch information
Wolfram Sang authored and Wolfram Sang committed Jul 24, 2020
1 parent 58031a2 commit 0c2a349
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 3 additions & 3 deletions drivers/i2c/i2c-core-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,9 @@ static int i2c_device_probe(struct device *dev)
if (!client)
return 0;

driver = to_i2c_driver(dev->driver);

client->irq = client->init_irq;

if (!client->irq && !driver->disable_i2c_core_irq_mapping) {
if (!client->irq) {
int irq = -ENOENT;

if (client->flags & I2C_CLIENT_HOST_NOTIFY) {
Expand All @@ -349,6 +347,8 @@ static int i2c_device_probe(struct device *dev)
client->irq = irq;
}

driver = to_i2c_driver(dev->driver);

/*
* An I2C ID table is not mandatory, if and only if, a suitable OF
* or ACPI ID table is supplied for the probing device.
Expand Down
3 changes: 0 additions & 3 deletions include/linux/i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ enum i2c_alert_protocol {
* @detect: Callback for device detection
* @address_list: The I2C addresses to probe (for detect)
* @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.name field should be set to the name of this driver.
Expand Down Expand Up @@ -290,8 +289,6 @@ struct i2c_driver {
int (*detect)(struct i2c_client *client, struct i2c_board_info *info);
const unsigned short *address_list;
struct list_head clients;

bool disable_i2c_core_irq_mapping;
};
#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)

Expand Down

0 comments on commit 0c2a349

Please sign in to comment.