Commit a4b5e48e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.14-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - add a missing Kconfig dependency for imx-lpi2c

 - in the core, handle the new per-client debugfs directory during
   probe/remove, not during {un}register

* tag 'i2c-for-6.14-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: Fix core-managed per-client debugfs handling
  i2c: imx-lpi2c: select CONFIG_I2C_SLAVE
parents c06310fd 6250ebe6

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ config I2C_IMX 
config I2C_IMX_LPI2C

	tristate "IMX Low Power I2C interface"

	depends on ARCH_MXC || COMPILE_TEST

	select I2C_SLAVE

	help

	  Say Y here if you want to use the Low Power IIC bus controller

	  on the Freescale i.MX processors.

drivers/i2c/i2c-core-base.c

+6 −3
Original line number Diff line number Diff line
@@ -583,6 +583,9 @@ static int i2c_device_probe(struct device *dev) 
		goto err_detach_pm_domain;

	}



	client->debugfs = debugfs_create_dir(dev_name(&client->dev),

					     client->adapter->debugfs);



	if (driver->probe)

		status = driver->probe(client);

	else
@@ -602,6 +605,7 @@ static int i2c_device_probe(struct device *dev) 
	return 0;



err_release_driver_resources:

	debugfs_remove_recursive(client->debugfs);

	devres_release_group(&client->dev, client->devres_group_id);

err_detach_pm_domain:

	dev_pm_domain_detach(&client->dev, do_power_on);
@@ -627,6 +631,8 @@ static void i2c_device_remove(struct device *dev) 
		driver->remove(client);

	}



	debugfs_remove_recursive(client->debugfs);



	devres_release_group(&client->dev, client->devres_group_id);



	dev_pm_domain_detach(&client->dev, true);
@@ -1015,8 +1021,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf 
	if (status)

		goto out_remove_swnode;



	client->debugfs = debugfs_create_dir(dev_name(&client->dev), adap->debugfs);



	dev_dbg(&adap->dev, "client [%s] registered with bus id %s\n",

		client->name, dev_name(&client->dev));
@@ -1061,7 +1065,6 @@ void i2c_unregister_device(struct i2c_client *client) 
	if (ACPI_COMPANION(&client->dev))

		acpi_device_clear_enumerated(ACPI_COMPANION(&client->dev));



	debugfs_remove_recursive(client->debugfs);

	device_remove_software_node(&client->dev);

	device_unregister(&client->dev);

}