Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e76cb7d authored by Charles Keepax's avatar Charles Keepax Committed by Wolfram Sang
Browse files

i2c: core: Tidy up handling of init_irq 



Only set init_irq during i2c_device_new and only handle client->irq on
the probe/remove paths.

Suggested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 8466b616

drivers/i2c/i2c-core-base.c

+3 −2
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ static int i2c_device_probe(struct device *dev) 


	driver = to_i2c_driver(dev->driver);



	client->irq = client->init_irq;



	if (!client->irq && !driver->disable_i2c_core_irq_mapping) {

		int irq = -ENOENT;
@@ -432,7 +434,7 @@ static int i2c_device_remove(struct device *dev) 
	dev_pm_clear_wake_irq(&client->dev);

	device_init_wakeup(&client->dev, false);



	client->irq = client->init_irq;

	client->irq = 0;

	if (client->flags & I2C_CLIENT_HOST_NOTIFY)

		pm_runtime_put(&client->adapter->dev);
@@ -749,7 +751,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf 
	if (!client->init_irq)

		client->init_irq = i2c_dev_irq_from_resources(info->resources,

							 info->num_resources);

	client->irq = client->init_irq;



	strlcpy(client->name, info->type, sizeof(client->name));